[PR PATCH] New package: openssl-1.1.1f

[PR PATCH] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Right now there are still some conflicting files between OpenSSL and LibreSSL, furthermore I still need to figure out how to set the runtime dep for ca-certificates. (The fact that LibreSSL used to "provide" OpenSSL doesn't help)

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 8696 bytes --]

From 4c3f308ca4e2b0a432ad7297536ebe38e274e78b Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 1/5] New package: openssl-1.1.1f

---
 common/shlibs            |  2 ++
 srcpkgs/libcrypto1.1     |  1 +
 srcpkgs/libssl1.1        |  1 +
 srcpkgs/openssl-devel    |  1 +
 srcpkgs/openssl/template | 72 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 77 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 08ddbc903bd..76f8b70e8b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,6 +1739,8 @@ libjq.so.1 jq-devel-1.4_1
 libcrypto.so.43 libcrypto43-2.7.2_1
 libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..fcf8c82a9ea
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,72 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1f
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib shared
+ no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m no-sm2 no-sm4 no-ssl2
+ no-ssl3 no-seed no-weak-ssl-ciphers -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+hostmakedepends="perl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35
+provides="libressl-3.3_${revision}"
+replaces="libressl>=0"
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64 no-asm";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	provides="libressl-devel-${version}_${revision}"
+	replaces="libressl>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 0e440f98e491c0571b72247d03b766fd20ac92ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 2/5] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 4790d556987..b74c969b405 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,9 +1,10 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.0.2
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
+configure_args="--program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL-License, SSLeay-License, ISC"
@@ -11,8 +12,6 @@ license="OpenSSL-License, SSLeay-License, ISC"
 homepage="http://www.libressl.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
 checksum=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then

From 0852e000d39d27f041b10f9fb8ba6b8559c2f600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 3/5] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 4be2b4f929b..aa2083fcfa7 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20190110
-revision=1
+revision=2
 bootstrap=yes
 archs=noarch
 conf_files="/etc/ca-certificates.conf"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<2.0.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	sed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 28a8395a40a6bea0bfd0ca24d24feaa152e8456e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 16 Apr 2020 15:32:25 +0200
Subject: [PATCH 4/5] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ef7d1daf047..9ce29cf39f2 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 831cf8f391a3e6c56c980ac87dddae4ba1bd14ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 16 Apr 2020 15:32:39 +0200
Subject: [PATCH 5/5] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 4a7fb0febd6..1f2ad8c1ab7 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.4.2
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

Re: New package: openssl-1.1.1f

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 671 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-615653879

Comment:
> LibreSSL used to "provide" OpenSSL

Isn't this still the case? Their [latest release notes](https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.0-relnotes.txt) explicitly mention compatibility with OpenSSL 1.1.1.

I thought Void explicitly uses LibreSSL instead, what happened?

> We were the first distribution to switch to LibreSSL by default, replacing OpenSSL.
>
> Due to the Heartbleed fiasco, we believe that the OpenBSD project has qualified and pro-active developers to provide a more secure alternative.

Re: New package: openssl-1.1.1f

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-615653879

Comment:
> LibreSSL used to "provide" OpenSSL

Isn't this still the case? Their [latest release notes](https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.0-relnotes.txt) explicitly mention compatibility with OpenSSL 1.1.1.

I thought Void explicitly uses LibreSSL instead, what happened? From the [homepage](https://voidlinux.org):

> We were the first distribution to switch to LibreSSL by default, replacing OpenSSL.
>
> Due to the Heartbleed fiasco, we believe that the OpenBSD project has qualified and pro-active developers to provide a more secure alternative.

Re: New package: openssl-1.1.1f

[flexibeast]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by flexibeast on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-615695270

Comment:
@agausmann: See discussion at https://github.com/void-linux/void-packages/issues/20935.

Re: New package: openssl-1.1.1f

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-615709887

Comment:
Okay, thanks

Re: New package: openssl-1.1.1f

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-615709887

Comment:
Okay, thanks

Re: New package: openssl-1.1.1f

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-617445687

Comment:
I'd like to keep libressl around, do not replace it!

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Right now there are still some conflicting files between OpenSSL and LibreSSL, furthermore I still need to figure out how to set the runtime dep for ca-certificates. (The fact that LibreSSL used to "provide" OpenSSL doesn't help)

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 14598 bytes --]

From f6d8c1238f9b1d424d34d06f953e6c2b00cbfa38 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 1/5] New package: openssl-1.1.1f

---
 common/shlibs                          |  2 +
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 88 +++++++++++++++++++++++
 8 files changed, 207 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 5f1a09de8dc..136d4d0167e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,6 +1739,8 @@ libjq.so.1 jq-devel-1.4_1
 libcrypto.so.43 libcrypto43-2.7.2_1
 libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..64812a35447
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1g
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib shared
+ no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m no-sm2 no-sm4 no-ssl2
+ no-ssl3 no-seed no-weak-ssl-ciphers -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="libressl<=3.0.2_2"
+
+alternatives="openssl:openssl:/usr/bin/openssl-openssl"
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/openssl{,-openssl}
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 9b86efc21688da4ab0775b760fda643d08cedef5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 2/5] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 4790d556987..09da520f9b5 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,9 +1,10 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.0.2
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
+configure_args="--program-prefix=libressl- --includedir=/usr/include/libressl "
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL-License, SSLeay-License, ISC"
@@ -11,9 +12,8 @@ license="OpenSSL-License, SSLeay-License, ISC"
 homepage="http://www.libressl.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
 checksum=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
+conf_files="/etc/ssl/x509v3.cnf"
+alternatives="openssl:openssl:/usr/bin/libressl-openssl"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
 	# XXX disable SSP
@@ -34,6 +34,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
 }
@@ -63,6 +66,7 @@ libressl-devel_package() {
 	short_desc+=" - development files"
 	depends="libcrypto45-${version}_${revision} libssl47-${version}_${revision}
 	 libtls19-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 96cd798cbfa295703cd49dbb39bb0faf37b4e7d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 3/5] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 4be2b4f929b..aa2083fcfa7 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20190110
-revision=1
+revision=2
 bootstrap=yes
 archs=noarch
 conf_files="/etc/ca-certificates.conf"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<2.0.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	sed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From fa40f17368bc2cc1fa18e79b23ddb8a8a2683b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 16 Apr 2020 15:32:25 +0200
Subject: [PATCH 4/5] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ef7d1daf047..9ce29cf39f2 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 8486d850d8c0abbc19e0fb4c2f1a9ea8715e837d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 16 Apr 2020 15:32:39 +0200
Subject: [PATCH 5/5] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 4a7fb0febd6..1f2ad8c1ab7 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.4.2
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

Re: New package: openssl-1.1.1f

[travankor]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-618235372

Comment:
I haven't tried this but libtls can be used on top of bearssl 

https://git.sr.ht/~mcf/libtls-bearssl

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f

Random lists of packages broken with OpenSSL 1.1
- [ ] mysql (to be removed) 
- [ ] mariadb (we ship an old version that is EOL since a few months) [mariadb.txt](https://void.johnnynator.dev/logs/mariadb.txt)
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)


A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 457853 bytes --]

From c78d27098fbe477eb41ca0490d1ca568d85cbd04 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 001/455] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 149e9bb59f8..c56f2f38c04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 55a6a56854b50812f25b85bb11fb35d8e7344960 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 002/455] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..1ccd88917d6 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=2
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 061a535d32d4ae33ffe85a9baa621f15cb0cd35b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 003/455] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 371a1d4445bfe9f32635f0e8386ad85668781eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 004/455] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 568b0d14079f12e24af1190a6644503ab74d710b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 005/455] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From 66abdbd9fd1242a2d8963caea731d9a3f7479c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 006/455] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 659713f5f86ffab98c00c4681bb5643e2e8cf7a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 007/455] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 2afa639fac916817c5ec6cdab8d5de101bd4abce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 008/455] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 2993e004d510d3de1034c1ecc916b0ac034919f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 009/455] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From c1717803d378ec314c8f7fc3b5cdfcd2bc70c924 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 010/455] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 72774f83a7d982818585a1f59e6d2456899c327a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 011/455] acme-client: rebuild against OpenSSL

---
 srcpkgs/acme-client/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..60938766d68 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -1,13 +1,13 @@
 # Template file for 'acme-client'
 pkgname=acme-client
 version=0.1.16
-revision=5
+revision=6
 _distver=VERSION_${version//./_}
 wrksrc=acme-client-portable-${_distver}
 build_style=gnu-makefile
 make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
 hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
+makedepends="libbsd-devel openssl-devel"
 short_desc="A secure ACME client"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="ISC"

From 4dabdb72db51c4acca05a26e7138bc6dfd33c7ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 012/455] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 68032f8a526aca5fb2063b094933e70fa2dccbcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/455] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 999d7133cf1d854d8972ebf67045fd3373a04b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 014/455] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From d25e9bb1d95513717525911adf7419f26eda1d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 015/455] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5cdc664000e4512a81968214cb6798534c1750f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 016/455] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 9f924d7b5546a65432202c4c34a7c74bb64c8e9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 017/455] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 9551e1dfc52121bbc5bbbd75956a6bf403b57e93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 018/455] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5ea7b7858bdb1b3e1e7d225f8dce00fb72f8a735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 019/455] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 7240b4082c5872e69e6d7d7845975a0219f408de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/455] attic: rebuild against OpenSSL

---
 srcpkgs/attic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 20f7a8f493c30dff11ec4fe3e09dad87bb4afada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/455] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 08f709baddf2cb5249a94de6f14d06ea4e891dfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 022/455] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From cdb99b457cecc71f63dbf7fdb88319fc964f6d89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 023/455] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 37b3a11fcbdbcdb1365b7b3cae6fd9d12901b420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 024/455] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 65282989bf80f3fb46e3b0cbed09ae4c1f8b16c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/455] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 65d0315182fbd11300b8566be3deba6a4ef13ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/455] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 769ef2d6aed40805e4cd0fefc5a2e259c2cff6d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 027/455] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..5951cad55b8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,10 +1,10 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"

From 610d5ca6a9a2d651cb61e3380b85b23bed658c8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 028/455] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 4b79babe2783707cf4f5f4f0c2392a20d4b219a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 029/455] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 1f1db4806e26f67d7def31952cd25010f840af11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/455] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 7ca8e16398f..fca1e587143 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.14
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 615c0876a7858777c1f76a2f01bf29b316a281e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/455] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From cfcd6ef09c9c384d9e7696f1719ab2ca1164c243 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 032/455] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From aa85a09823de8fd2460cea2c71091b01ec700f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 033/455] burp-server: rebuild against OpenSSL

---
 srcpkgs/burp-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
index 85cff6602c6..c2853cea7b3 100644
--- a/srcpkgs/burp-server/template
+++ b/srcpkgs/burp-server/template
@@ -3,7 +3,7 @@ _desc="A network-based backup and restore program"
 
 pkgname=burp-server
 version=1.4.40
-revision=12
+revision=13
 short_desc="${_desc} - Server"
 maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
 license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later"
@@ -15,7 +15,7 @@ checksum=2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f
 hostmakedepends="automake libtool perl"
 # note: burp provides its internal copy of "uthash-devel"
 makedepends="
- libressl-devel zlib-devel librsync-devel ncurses-devel
+ openssl-devel zlib-devel librsync-devel ncurses-devel
  acl-devel yajl-devel ca-certificates"
 
 # unique binary for both client and server: server depends on client package.

From f58a4daae40315ff6942707ca68c4f48135ca323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/455] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 32fd97b073559c87b90cf3b13eb087d51b8ba6c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/455] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From d457bdfa33cd73394962325c1e9676c642f11d57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 036/455] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 233eeea6e1372a840366e733f2c7b5032636d1d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/455] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 9220d95b01e68d22f2abad2ddd0b818adf2ae350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/455] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 6805eddb219f33ab946d60e171e0a3c0a8c39fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/455] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 122d9cccb6b8b554be13104ffbf47a1294ffe144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/455] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 64d91691f80e91666ea4762d8fb1efa3322c2026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 041/455] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ce9d8db6ed055663817d1d62bccccbcc03117415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/455] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 95961f3b47c976eed3c2888f3095a83160af9907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/455] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From f3517eba617b9a31ea8199dbfb27e15592946f06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/455] catgirl: rebuild against OpenSSL

---
 srcpkgs/catgirl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f0..6e4f7e883a7 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 40fe41e8f3b237bdc3ba13b6b541f1a120d79a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/455] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 6bb6cb5854f64479bfb3511ecde84c80ed9b347f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/455] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 6910ea737ec58dff2758de8008463de1943a9624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/455] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 7e65c12209060944cb2726bca17c2ad9130788b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/455] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 32ed35e4318e9feb6cd094d79f42ab2de0dcf206 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/455] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From e57537ca78336e16b688558031e432277d226b72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/455] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From cf52b6f09edb9b65e2b06fb9f90e4c367328473e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/455] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 50eeda57a3927f534dd15872ee6a8a53cbb71e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/455] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From b820e7949a84c71c4a94fbd402629c648717e8b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/455] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 927c8baab61a3462e4061fa03690ed99a65e1f10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/455] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From d4053997f853e45a5bed90a8cef58aad8a0d3e61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/455] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From c38b65cbcade0e8a0759bea7a923d4ee2dfe1b04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/455] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 8ef9deccf7f4bb0925d04aa11ecacb63d9c9bf02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/455] dmg2img: rebuild against OpenSSL

---
 srcpkgs/dmg2img/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 80de57678c062991e13a5fb85facd523f186f31f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/455] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 843ec2a6afb7aaee3fd3933a32d541988dd2e21c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/455] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From a5deefaef44ead39ae398468fed4a75db8c86da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/455] ecryptfs-utils: rebuild against OpenSSL

---
 srcpkgs/ecryptfs-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 7f63c698bfaf664adf8f31c81778e08d13628b07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/455] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 8df744e3a5c0bca4f32f2afc883dd98008f4ec7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/455] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index efb3019a969..10908e12ae3 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 5d5b42f09b93d1ed72d3c56fbb2af59fea8a441c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/455] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From bd65f57e12996ae7b0860ff8b2486ae0c0739884 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/455] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 5bb2400db85ad44c33d95268a88229293ed77448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/455] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 7e122d3a8b4aa7a7d316b70d4732923b38f71d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/455] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 1879f6b5a87c0d2662a53840d77e2deceb44a2d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/455] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 4014189038828c9cecf27141d581bde1e9fd3531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/455] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From ad4d0211c7b8774547c90db0bafe3d1291453b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/455] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 476c06aef13249805351870b2d27c7e7ac10550d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/455] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 27853ed285e9393ba307a5b7d33608dd7791fd54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/455] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 789e31ae16c220325b0b6ec9495c05233e9c85ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/455] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 0905993ce7ac96bd013ce97d2d39f8c88ab27a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/455] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From f0d2a70d2268084eaac7586bcb0e4e9c20f177dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/455] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From e93db833bab6e45ee5b17ccdb4e781a8edc9399d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/455] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 7b3a4d07ccc923d0a555ed4894b7ae0a6f774f5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/455] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 15f6e4d7ff77044d2819eb219ed826aba2d00dc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/455] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2490667ab89f6a4e40bfea988470f94a6c075ea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/455] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 71fee897c6e019bfd663938d9cf14197815e414c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/455] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From d3c8abccee8e83b1e9fda3b8c44a29dbe3c4b227 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/455] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 204ea00aa763b1acd755144ebd2dc8fe5d129fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/455] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 895540426e6651f22a8196c6586513fcaffcbf80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/455] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 944269ad62f245744748503f96081d7988414cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/455] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 64c2423432d31e12f4ee7a074718a1c20ebd027e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/455] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From e61cf298055f76450268e6610694c118319544c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/455] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 0f4c9ee7dd3bad8a23366c65f1f5b52846731cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/455] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 8e1a4f0007795700b9cc5704471c214dd15f2101 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/455] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 262ee7c92702d6ce19e8f1fa64ac14db6f91d614 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/455] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 41b508591ff8a979d599caa8aa3a025fcd3e599a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/455] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From d5d1bcf16cb9ebe2b5d0791a5a741cdabf8bfe72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/455] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 97cb171234cfba8f0d6aaaa8dbb051bd228527cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/455] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 7752a052695d87ffe8615497f2a962f9b68583d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/455] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 60edb5300925a89443e7423a8850577a022fbcfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/455] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From e0606f12e559c2b539951e50aaff87e13f1a9df8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/455] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 04f5f24cfe142a6059404c788f4640899b221620 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/455] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 5f945ed016a2b5ffc942bc35059d4ec3b19188ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/455] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 80b5bfcb52ef428dc52fc09c0edf521418575694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/455] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From bd2a2e52035d5dfa4a1bee26cdb445521f1bb253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/455] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 266d57be4e9fa00a0643cdcd8a574f26fc72486c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/455] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 31f34fa2fe88ea97a06736fa47838d53928189bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/455] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 6bd82107a25..ab54cf96bdc 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 2901d7e39d861e23947b497f87c533d1e852bb42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/455] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From e73dae7e4e69e2e9d1528be21ed8107e6dfe0b47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/455] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 45dd52288b1d8de58a0658172912096f70ff3b81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/455] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 0267894a1c2af56240bfebb2e75e6c911740b7c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/455] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From dea39c6f54450a3da6efd6ca55a5ed747932b61f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/455] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 9a2caaa472e5b1f4ec2287fbbec057226e33d5e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/455] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From a1c168dba4ba7db217c754ec8d0fa2ab808793dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/455] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From f84a62ac88148296c26c0562a69780b5157c90b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/455] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From f5cbb3e7994e68532d3adde2bc5e800536d90cf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/455] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bc64240ef830662d2b5103aa23ca0a232df693ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/455] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 45550194802ad85c827cb1065823e3f753eef69f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/455] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 532d702e1ec22382f14e0911788442c553dbc0a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/455] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 79de0d51219d975dfc480b94b1b789663673eab4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/455] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 366e27e539cb8382dd334f0c5d85584e0909ffb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/455] ipmitool: rebuild against OpenSSL

---
 srcpkgs/ipmitool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From dc403fbb9694af52bc605c926585afa78d53d35d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/455] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 28d3fc151b483940ee2785c77cae338094ebd7f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/455] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 0c753ca2b7f35bbe6eaad4a76be93d4ff243941f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/455] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From dbbb311eeb6a803392874ba458c687c219b3de07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/455] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 44c6f782ef03578ee72af3d998484c364576fcce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/455] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 24a30ddb41b916c5a0dc1ba14ecbe608d22a9914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/455] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 6d4fb1406a94d32a2b5a7c426e8f4665427d38ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/455] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4e645efa4d26eec2f8afc281ccb7183c950b848e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/455] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 9e11bcd3e3d345d5f220b24dccac9dcba16f59e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/455] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 4de21aeba4a4fb6114a5767db71dd188ae2f98ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/455] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From a6a5e8858fda777ef37d2e5767272043bf841913 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/455] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From d2000a507b5affd19c04f16f9b9bd786282627b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/455] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 7a35a3d7e6cd47deababa72106cb1b7ab049aab9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/455] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5901bc5a018fa8c7e98546aae016bef159305a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/455] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 4d2294476612f17a707f1bdc29f6318bf1240f59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/455] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a7f77e1f77d1a6fd364154e2aa829b463f365cb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/455] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 5a501ef322c78f4ed5a2afc82ad67cd627f83ce8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/455] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 4591d78f58909bcde132a046ac0cefd6fece0484 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/455] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 916ff6dabc73fe1d9b4997e043afb49a815dd551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/455] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a1d50d05c18346c2fd5f404f93dda526a45b4d6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/455] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 23687f428e533d16632b3ccaec85e28fc84e1c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/455] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 532e19da342df874c397b053089a92cb8650979f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/455] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 0d05a025ee21e88e6dfd5cde4c3b72f5f399af7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/455] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 0a79e5050ca01cc80663350640314ab9f8c871ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/455] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cf1cce7e55cfd2b90283acb74bee18a34d6d4fa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/455] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From c9449ae216289873709d8dbf3bd1360dde2a98d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/455] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 1cebda7f81a4d15fd4195090380fd686f46e24d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/455] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From e78386cd2587cb0c18ad0856566bf8f21573ecf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/455] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bb613e37d2df76bf771ff9315d348f52b87c99d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/455] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 02e15e52f5536a457f18fe1e5861929a79cd0844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/455] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From e411fd05c1a750c6baae25a574c9629290ef4a3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/455] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6d8bc2ac60473a0040a0339a230a292638e518ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/455] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1ebbde49ecd791797bf57a767473a4b3d237f0cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/455] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From fae16f8b2202c1b3c0d9836eddf28aec3b6e2afe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/455] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 62e2750202900b4a59ffd501c574c155e8bb7d69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/455] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 3557787e6b77716f1d783b28cfac48527ea2e088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/455] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 237e90d876ab30c4410c18ef4c20350f15dd879a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/455] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8217e1b941e5c72622470fb3f386a99f1a0bcfd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/455] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From c6be303312b63d381e91dfc376998ba062f65817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/455] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 5e53c01ea69730ac5c056e7991eb08ec9235b9cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/455] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From ce51d85cecd2715d36c5ca4ba5c5b6fddc190a6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/455] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d482b4d181e2cd8e25e712993d3c749158112449 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/455] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 55a796e4d4c685e3186db9be1a09df2c0fe0f295 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/455] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From e9b126f536e0b49965f81cb6f998456a01e56fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/455] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From eead14792db74ddeba5f0b54b059f7072c5019a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/455] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 97a9826f9a4..42b2ddb12b9 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 9fcf09edc1692dd13827d62c5c3b847661cea8b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/455] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a5e1047ef93..4419686104e 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 3a7d5c3ab41189e008c8ec64f92e8b3687aea90d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/455] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 395f2e23064..5614d88082e 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 776ba3e16713becf8625d66c7bd0036c9d6ebab5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/455] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 276ae9fc7e2..e94580971ef 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 702d3005457662ebe70c61f181531dd26b005694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/455] linux5.9: rebuild against OpenSSL

---
 srcpkgs/linux5.9/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.9/template b/srcpkgs/linux5.9/template
index b17e8da33f8..deee2f3706d 100644
--- a/srcpkgs/linux5.9/template
+++ b/srcpkgs/linux5.9/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.9'
 pkgname=linux5.9
 version=5.9.16
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From dba6d8af3942a47c67977d89358e1f649048fb27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/455] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c0e9f374ada1ed3a8c9faffc43d0cabb4e3be7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/455] litterbox: rebuild against OpenSSL

---
 srcpkgs/litterbox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..746d19c13bf 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel openssl-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From cf3e9100fa51bfbc80e0047ab6787e892f5143d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/455] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From aa2f7193bffbcabd9f094691e65bab08ff6d028e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/455] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From c823347935c1ad610698316e0b1c508146d64094 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/455] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4f10807a6be2dffbb049bff22b9ba84243ed2e86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/455] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 86dc8dc13bf7af56a9be5fee2a445ac307220c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 170/455] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2d9ccb9706a0b905c7b2610a8d0a98a7fa0d1164 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/455] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7882059e27a33d5fca36ce3887bcde72e577e222 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/455] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 4ec5d4aefa51a796112f57445822b14507619911 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/455] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From b6dbd8a055d0fcf0fcbb671e156e7d86969a7ed7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 174/455] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From dd5ad0c9cd4ed4b95bb7ae5670978a1250a9a8c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/455] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From bbb166882a31eda695fdc3cd45ecab94594a9144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/455] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 88598a4b764d188c034ba1aaebccee4285056396 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/455] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 006580d160ce7d66394a6d7a06dd2643bf7340a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/455] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 6a02dc7a34f7e33f7175855a7eec394190ec0a9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 179/455] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 182a7461500e869cd1c603ef81d677f1b28851ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/455] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 9cf9deabf52c56ca397657fcc31b7c0442b21dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/455] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From c379fd539634c3379fed3814e1218852a5d0c531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/455] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 3585f83c5268f5ea6ac3606a722fc1e60c50eed8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 183/455] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 2c1161430a8cc4486748977437f2f30157228a0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/455] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d9e178fb977ae8bebde24dafd1a2896737e4ddd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/455] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 87165ebf49466da158c4125ec798bc120d24c6ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/455] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 3422814a4b970c68d48570bf9b0342051ac2cccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 187/455] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 2b1530ac2c6ecc50a879b168a2ba68afb16bbe96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/455] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 92a889e20fd252e799dafd82ec0e86590336ff62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/455] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7a836407cca144f80f7797773e8efb3b27514093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/455] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 45c05e21a3428ab12241fcffa9c4f73237dd5b7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 191/455] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From d8af70a0cf375574d036268879da760742a9ded0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/455] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From cb6ef9b8dfb8ac0092ff306c0adf4af5dabc3ce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/455] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 1c4e20e3a05d0c82062c0db0f68db05a50a21c1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/455] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 8303e47d71eaa9d372e692038e6245d7f2f231c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/455] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From f67ba3174ea63f0ec2ac5336ecf84d73155acef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 196/455] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 8aafe617efb4539aed81b8985b2ae01b548b9365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/455] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From e301fd2bbd6e06b9476af853d3ba572f06c35f0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/455] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From ba54eb935172abeb6c23dbc67a194fd7ecf29f03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/455] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 5b1166ef964e926844d855829005dd172245cf85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 200/455] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 06b79f3e5265f4952396974c6fb2ad4ccc759854 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/455] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 1bd1f960827196901d5812b50d44b728be9f7ce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/455] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 705cf4e664f7d2641eca43e2e62bea799738eb76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/455] netpgp: rebuild against OpenSSL

---
 srcpkgs/netpgp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..3ef9867c3a8 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"

From 1467fc9c9d3a9b8e6a2674397923c9bbce358b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/455] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 316dbe8c29ffd356e75e72ea9f41e1ff5bd73138 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 205/455] network-ups-tools: rebuild against OpenSSL

---
 srcpkgs/network-ups-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From f4c4c3cc99d55b5ff5affa7fba30fcda92f3d834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/455] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 95d2038d71a49ad0679809d054fd5d4003f48a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/455] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From a7b1bcefb31c1243458be9a6205be51904fb0e91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/455] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d..786d3992ce7 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,9 +2,9 @@
 pkgname=nginx
 reverts="1.17.7_1"
 version=1.18.0
-revision=2
+revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b8007ee0db6ac0fcb2654f8aaa89f3b5076b2177 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 209/455] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 46420f76093124c7d0153a7d36f1bf48e258f31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/455] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 02cdee56d6e1064a269d4bbbb8dde5aa6ec307cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/455] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From c9199be00952f1b5f582fbe51ddd96c88bf07911 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/455] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From b0726139597861b9efb3b4037ce5d459df667e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 213/455] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From dc9e25a0546144db2b566c943ced13ae309ba5a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/455] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From da3f7b51a752d343133975f73cc65c8b70d26a17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/455] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.21.0
-revision=1
+revision=2
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
 # remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
 wrksrc="nu-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 900fdbf9a859695b6f7cef042c458ab21859ae17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/455] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 4643c033c66464f406957a7e054c710bc2e7013b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/455] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 7402fce4d9cb723efa56c9953ec3ffb2d319f986 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 218/455] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From b693de0e7acd2724dd81b4969bcebd14565095a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/455] opendkim: rebuild against OpenSSL

---
 srcpkgs/opendkim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..7c46b9f7a65 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"

From c179a598b5709fb975f1740ff2f478bd4ecb4bed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/455] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6f..5a50ab3f5c2 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 49d73b042553e2a73022018f18dd65c4965b68df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/455] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbc..5b47c649eaf 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.52
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From f73f34d7e71b6962ed6b1fcf043919ad8a7b9745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 222/455] openntpd: rebuild against OpenSSL

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..e079e5942c2 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c26123fb77207906a8050d0e71fd49d16a08db0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 223/455] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 52a37ee13e8c0e99912422318b20010f8db0daf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/455] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..b582821ccee 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -19,7 +19,7 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From fa554db42740a27ad38525ecc0ac4d324eabe900 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/455] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 4415c76ad625cfe88f69b061a04f689b7fd65629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 226/455] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 0231037bb4f..1be9de3cfde 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.0
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From ca9a616a56035a11c4c2658247ea27db376290aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 227/455] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From a8e757d00f0df8e7864bd3cb2f98100a269e400d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/455] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..dc1552b8fb8 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"

From e2b82c68ad87b301959b3d1348dd235735e33e7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/455] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c6fad3e1086c8ab470cf6b4fdde9f4a4bd0a902b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/455] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 36fb35dd4fba98cdafbbaa6d8f9d9b3c91185af7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 231/455] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 8b6d7646b4593b13ba25bfd95e826bb51508f8c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 232/455] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 07f097fd27d920edd56a1b51a059053262be0653 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/455] pam_ssh_agent_auth: rebuild against OpenSSL

---
 srcpkgs/pam_ssh_agent_auth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..a4e09ed9584 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,10 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 0b46629caf152cafc5632b5bb890d89239681915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/455] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e4c56a3a4d19e829ac8fa1be807f262b05d618c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/455] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c54fd9ed04d0b50fb2f42d41e412720080b29e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 236/455] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fc910bb01df058046646ad66f7b1dd1f3a0ed6ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 237/455] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From dd3d929f00c4f1ea17c30e685595fb41d4d38c22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/455] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From e7b26c916a36eb62baf5d6e482cb9ec0b898b026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/455] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From dad6537c8402c174cfa76713d543efe55f61e77a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/455] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 8a78889f6b9a633bcde78593d3b13b696344d4c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 241/455] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 29f0e0386533eb0de167d41f89d63e2429a03cfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 242/455] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From ac611d12e88ecc18ddca0184785977a157db7b8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 243/455] pgadmin3: rebuild against OpenSSL

---
 srcpkgs/pgadmin3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..7c63e3bc5e3 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,10 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel openssl-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"

From 19fe39eb64516b24d4518c4cb573b8ff3a446a9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 244/455] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 5e549e457d56c861d366741cd0a936ce4a34a398 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/455] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From d7d87a88bf0c616e9e6aa7431b84e7d60713739d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/455] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From f76aec20e55dfa8ba358182817febc20ddcc75f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/455] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 1e637711e3ea47149bda60da50b1be0d49f13724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 248/455] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From e4c4858fd6a0e91877bf201cd933b09172fd140b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 249/455] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 43e3c2e96a292223aa7c7d2ffc42afbe47764abd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/455] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 9a04515a3d0c2ef033c4e09e37ca6c99e0027b9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 251/455] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5c4693b517a9673c67bd5ed5fb84220f633a3377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 252/455] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index d12ecc4e5dc..be3d70c7f42 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.5
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8cd32913dbbf19b6dff2aae2a3778b842b18e8b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/455] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9aab64225a5..55225572013 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.1
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 09c2cee1617d3da83f2540f72e4945207d752ce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/455] pounce: rebuild against OpenSSL

---
 srcpkgs/pounce/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 57959706a54..a0581f90513 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 1a9d6a8770f3a6183cf859c02829f476cd17181b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 255/455] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 65953e68cb61f85e770b9a88cd15c854b29b5526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 256/455] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From c3e7d49bc0fcba47f61cc978f094455cba730719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 257/455] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 5d0187f8eca9574d282cccc3acce9cb3739c90ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/455] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 44e4a9fe162f12fbc5fa312e4a8296896da1c241 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/455] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b5a56c8f530428bd72d2d4bc5880f321deba5cfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 260/455] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 6579b004e38..0f8b8ff7162 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,13 +1,13 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.1
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libressl-devel
+hostmakedepends="python-setuptools python3-setuptools openssl-devel
  python-enum34 python-ipaddress python-six python3-six
  python-cffi python3-cffi python-idna python3-idna"
-makedepends="libressl-devel python-devel python3-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 python3-cryptography_vectors

From 27f81fe663ef1575db22866c7d9613f4e9a696fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 261/455] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From c5d98b1e99085ee6ca4ccf5b0f658690729c26a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 262/455] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From a5547b03264ea641e819e55489286006a91a41a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 263/455] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From ad75da7022ffa467684787294c7ec33a741802de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 264/455] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 61bf25af67da0ea2e093451b4a53cdbc6e318b97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 265/455] qingy: rebuild against OpenSSL

---
 srcpkgs/qingy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
  $(vopt_enable pam) $(vopt_enable x11 x-support)"

From f081c0e96a6f683eac59cab981fac062d0a0f7dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/455] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 184cc7008b20b1ad8fedd6d02abd9dadb1b1bb5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 267/455] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From a16b95a300095ca1c7631d532bd032bb529a09ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 268/455] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 5da01981509fab51b349a88db0e21e5c68b6cfd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 269/455] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From d1a97fe00f8e8bfe52faf6049b802d33f02bfc1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/455] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 626ad7efc7d85f508e184119ba9a0f8973e436ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 271/455] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From c6146859652d62f4edcdb51b768da8d9c077944c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 272/455] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From d2086bc8a91f1d20eb48c87c0a68a8a87ff5c004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 273/455] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 3d1b2516a6b53b32170730cbddff47528107c278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 274/455] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 198a5d03cda14873bc12d41d33465569c2d23e7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 275/455] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From c8b44a80b18a494b3caacef9fe3563a412a6eebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 276/455] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 3a1c972e4be9a082e6b55477e6daf5c8ba291742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/455] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 5cb4dc70bc73c0502fa0d8418b1b79f3ad29bb5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/455] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From c8ddd7635e6b2b7b59fc66d2330dbbcc5a936b35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 279/455] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From ac4c1521b1284308992d4509d7fc08edbc5f9960 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 280/455] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 084fca2526c2f5025595a4fcc7bd1eb7b214470a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 281/455] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From eac6add14a0004de171dbdb3483805be24608f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/455] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 8d6b6e38ac9ff0dd0c5c377468bed3fb6bf55c4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/455] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 687beaf014c25ca55a33f2bb06c4d891c1e86d4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 284/455] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fa817ec50d39a29facbd5a2876b293b46f8b57ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 285/455] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 0c8c608abfa183fa9b5bdd88396f0448f2f68bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 286/455] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 555ffa87f4a7a679d2e55a49daa9895e5c9bf8f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/455] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 93431ebaa1467bd76f15ba762c88b065ff16a96d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 288/455] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From b703cf49c0e621976b8cf8e5a2292cbf26333723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 289/455] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 73cc5824e7bb1ecd853d9c79a38e60095b057f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 290/455] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 8a5028635837e21c227c1348a71cafb6750d81f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/455] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From c57bd127d87e78cc782f9cc870ec5bdb303ac530 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 292/455] sitecopy: rebuild against OpenSSL

---
 srcpkgs/sitecopy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
index 5fc4d36362f..4a8de6f0db2 100644
--- a/srcpkgs/sitecopy/template
+++ b/srcpkgs/sitecopy/template
@@ -1,11 +1,11 @@
 # Template file for 'sitecopy'
 pkgname=sitecopy
 version=0.16.6
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--with-ssl=openssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
+makedepends="openssl-devel neon-devel"
 short_desc="Program to easily maintain remote web sites"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 86346f828b329ed5b5a7878f7f43af936cef7321 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 293/455] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From fe4548adca974ff468e41ef468d773bd6d0f715c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 294/455] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From a4193ca8c9b4503619dcd7d3ef7234d48180b648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 295/455] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From b0d96564aee4dfbe18ecafde7d1a3be095d86641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/455] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 68084f4b55e211d5267b4db2d015273c42293c38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 297/455] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From a014cbf6d74c27e05c00ca8b6c94f89a085dc08b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 298/455] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 0fa3f23f9769c416903c517a27310539fa70359f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 299/455] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From afed11e4e25bf055fae0f03a3093a3a4a36a3802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 300/455] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From b9eb78ed242222b31f268d239093342faca9ac44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 301/455] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 21c17ad2d35b26fbc8f1c1436d49539c14f7d5e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 302/455] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 08c8cf680556b96c07a913e6d02f8b4edf9ba549 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 303/455] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 4c41803df26..6173e216694 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.12
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 3a9f32ce66ef4eb3281eb413c52a51f477e52e78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 304/455] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 4178a72616e109d3816bfe6f89dc115db45576fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 305/455] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 71d0447df6c8dad6ed00dd262fe53f29b25ee660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 306/455] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 6391b10ee3b8c727924b143ca58a27dcf33530f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 307/455] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6aadc026d4ca7e834dae17bbdcd503af9b0941a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 308/455] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d0ea2ca9b33e545ef0cdc180d7f7918aa76a712b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 309/455] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From c3c1d59d8524725fe374040494b971da26c3d1a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 310/455] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 4506dea41d48d1eeec25b7f36dc739b6c8d5a71c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 311/455] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 5b9240153f4338dbaa3e75598d4af28036765d3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 312/455] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From a11aaf5e6f0fe1894dcb0b7db617f7c67fb52cbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 313/455] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 70f482eb00eff42b2b166f3e3851b6b3b90ae00f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 314/455] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From e4cfc95507d60a2bb779caf7edc6351591045ae5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 315/455] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4954844a9894389b65a887512a9ea0914a022ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 316/455] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f848481fab01dff602278af8a28253d9382427ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 317/455] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 20d66e227e79525ddbe1733a90a5868d45cb0b5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 318/455] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From b1d7895bce0147bf4463f76416863ca889651b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 319/455] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From e679b417e3916ceefadbf84ed17ce1028363b0ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 320/455] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 1ae3092ddb77c389224419ae7441d019f586221f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 321/455] telepathy-salut: rebuild against OpenSSL

---
 srcpkgs/telepathy-salut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..367ae2b7803 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-tests --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ openssl-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1d894404de81e2eaec65b98473b40138f86a0988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 322/455] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 6bb0d925e470c65f99e291141f8557ac2a09f684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 323/455] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ed8d08b458985c4ea65ad996c7f701f34ed5a436 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 324/455] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ebd9bb2be2538861d76e43ab1b385fc7d598ccab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 325/455] tlsdate: rebuild against OpenSSL

---
 srcpkgs/tlsdate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index ccdbef1a5d7..aa3b54b4c6b 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,14 +1,14 @@
 # Template file for 'tlsdate'
 pkgname=tlsdate
 version=0.0.13
-revision=15
+revision=16
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
 conf_files="/etc/tlsdate/tlsdated.conf"
 make_dirs="/var/cache/tlsdated 0755 root root"
 hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
+makedepends="openssl-devel dbus-devel libevent-devel"
 depends="ca-certificates"
 short_desc="Secure parasitic rdate replacement using HTTPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 877309f33da47d8f81a8d57caa6285e7362fb685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 326/455] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 4bbc8c48a3461c42ece27b0852a2bd7e96806660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 327/455] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From c9d8dd9552a934d793b922809249f6aa724423bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 328/455] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From ea345ea5b24cb8c5a8396b8f1ef8a1c4ca792e30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 329/455] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 9270e5c9e32b39268d0b50a2d2bdbd76d489efec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 330/455] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 2c407e58a4c2240fe17520b5b5f6c71b6054d899 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 331/455] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From d9a754bf2cf2b476a633f46fde0e75c21350b392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 332/455] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From bbd6cb1fc2b01237764ba629fea18e491de989da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 333/455] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 125ece01049ccb2e4c0a553f7cee0da46ed066fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 334/455] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0c07f977c7308d85440fa23708d8ffebd4418a2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 335/455] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 915e0e511a0a31b8d7d580d130669cd93143a378 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 336/455] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 38ff12cee69db6f2fb0988313791eba6908e3b8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 337/455] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From b6809a40734ef61ae7ecf01551b4020d04f3f032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 338/455] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 940fecd0610bb9a1a89d166ebe9e0260d89ca925 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 339/455] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 5bb6f9c4bde..11a8b09b47f 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,10 +1,10 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=0.22
-revision=3
+revision=4
 _commit=9e04497a127aa6413463ccf4a4aee75f0d581d92
 wrksrc="vanitygen-${_commit}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 971aa73ed819651963eee7ba0c46a8346455b8d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 340/455] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From de1efdc82609364939354e86af6f7253d2fd289e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 341/455] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From c143c50c36699f013f8c847e154b46f9b70f417d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 342/455] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 668754c6ddbc52fdd20ecb43c699f075f6c95f10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 343/455] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 136b3fa7beec8a9202e28dddda77dc4b5f0fcc79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 344/455] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From b50dfe8ab71c54ef3a0df4b7dda0eabcbf053019 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 345/455] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 6b586d910aed821bdc62a447e3176857a955e68d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 346/455] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From d9d2683c2dba5351cd44a6464c879cf7431e12cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 347/455] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 3b464628d6cb44d8d79b9fd00d335c67be060380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 348/455] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 79a8fae4aec77371753a05bc4aff5eb901d6b77e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 349/455] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From a70c0a3dc5f2ea9e7cf86ff091b813dde038c3f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 350/455] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 46cd3141e222195111c262d8f10a1503fad9f473 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 351/455] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 51ffd8ed8c85631c8047cf61ec1ee8c4aff6c834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 352/455] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 7ed748a0965c1d6cbdbf2e9029a68fd37da53608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 353/455] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 8eb8ae1f4f7d99acf63c2daa3a893cfa7cd322f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 354/455] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f8337790d0f09dfb5eee61d858a7e95118e3a5af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 355/455] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From ba5fbd112a9f6f668966f452710ede335ffb5f58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 356/455] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From bbb8debd730df2ed2b8cdbedc0d30b6f76e10c43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 357/455] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 3b8ddc9d27a0adce4f0aceac9d6a57cdd6a9cbf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 358/455] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 4d8357d3da2614933779cec89015228e624a472b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 359/455] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 80ddfbfb9c7722d17842763bacb3e6ca31847165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 360/455] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From f2794dcc1b0904927ab0fbe0a98d8de849f0e29f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 361/455] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 4769f2996c0bb5fd7a873efc45bf8dd5633559cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 362/455] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a7e5b92c7339e69d14ad7bf01745c635f2c27605 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 363/455] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From d2cb7bbd2b5560ace3eb2905678d82ca6a6a2853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 364/455] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 1f2e9338fdc3b575845f627985b23a834cbd9b31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 365/455] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a310cc1630befdf6bf8ef3a4ae46a404bf9617a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 366/455] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 93c11e44c1c898f840d1b8bf56103be374dc18ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 367/455] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 8024115865d58e3182c41d1269f82d14503447cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 368/455] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 853e5299453db2626c9b7a544e32a9f8ba7a2dbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 369/455] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e4b46ed7ee2138390016eceadf6f911ee075a488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 370/455] c-client: rebuild against OpenSSL

---
 srcpkgs/c-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From ef5dab795e2625563a89c47a49a30e3581384dda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 371/455] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 9b91fc123fe366d393df94165f5ee80a27d1ec4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 372/455] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From e92e2eebfcbe78dc0bd9c2a44e4e81f6c3bb413e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 373/455] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..41f56468863 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"

From 34d87948dc69585d60a968b2d3fb5643ccb46059 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 374/455] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e237e6abe1171d2a5b8f83e14ead6adde7ee3b25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 375/455] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From a7e1ba31132cdb2e3adbdcba6ed1a24edda784b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 376/455] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 73ae90016ceea95ba7328020ee26c93f7cb762df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 377/455] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 75bb9c84e8b0fcbf756d7e4b151b55cf8c6cc444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 378/455] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 294981f70771e4f664a2929994e06c9889311ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 379/455] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 0e1a2f2dc402544c8d26d0e85f5a32ea22fc3041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 380/455] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 85e1b78480d5ec301374aad9f4cce72c396cc9c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 381/455] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fbdebebc88f44d17b8b4d08ba73eccf9e2159b90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 382/455] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 5007883d349992a4511f985f810144e0d2532116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 383/455] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From fc1ad6970831a13357f7a3c1dbae92de33fbc112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 384/455] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 9eeab92a8824f9335a58dbeea914e1cd3f91f0a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 385/455] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 798a0638cecf7f8195c98cc25806d84a80a30d24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 386/455] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3ad7921054f555d9ae640edf745ec5a14f6e8775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 387/455] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e4caed5e63b49e03120c86b1726cb440379128ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 388/455] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 8ec765fff539bd5e4da807e9b8d4c9b7f7ab8ac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 389/455] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From ec5574d469866604506475a5ff20d211f50c0b2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 390/455] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 38af989b9e39c05f05e1625ea4af3291d69c8e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 391/455] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 17c8df8df40e839f992588a814a26df9d220145e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 392/455] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From a632d21cf42691c75dfbe6209ce863acdef78dd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 393/455] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 15c8605bef3746e7700a75d7e7a51f1d7d92744f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 394/455] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From b1e83df515db411d7ad8e31025c3359631d91c6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 395/455] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 00d7e2bf51162abb7b8af0d3f2ddc584458b69fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 396/455] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 277ca012b977bb8df9b0cb50e0603672aa63a078 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 397/455] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 4561b3da097..1756905238f 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 718595a54775b0c429b9fdda78bf8e57c34e99f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 398/455] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 9b875c7daa0..0b873e75d57 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 0833c4f8dfb97ef124698a5dc62430c3078c906d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 399/455] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 73e8d3c3ff1ef0d96fe69aab77d2340577719a11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 400/455] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From eb8cc2b5a158538c5694e14b377649a74944943e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 401/455] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 4a8c27b256626d1e336a50df2c54719326ed1fe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 402/455] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 1d9b3cf702eb4a0a4e094115f83cab98a0f8185d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 403/455] fixup! Resign as maintainer of all packages except
 xbps.

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 38c054de4a4f516616a357cf2c60af439e932117 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 404/455] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From feb2e085a819bc2bb77b92ec1a7f4ffbe919a363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 405/455] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 537dd2c36fbd8a4c2c3ee4f27ac0fe5d0c150d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 406/455] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..75cf9c33500 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config python libatomic-devel zlib-devel which
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 257c3b41a35f4184e68ef7dc76269a6a06c75152 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 407/455] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 9b51145a096436eabb9f3e8f32ae7ef9c107f567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 408/455] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 5429e6aaa26e489d66e9db2170ffe42892ad45df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 409/455] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From c312c436e139e04d8ade9f24e5f877e7281aaa87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 410/455] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 4ef2a4a2a566d0452636eed7e8fe3c4dac36c8b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 411/455] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 00427b4768efedae391968e628e35b6beaabb53e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 412/455] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fcd289cfd1db3e58dcb27ba06b2dc7d6d6e6ab87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 413/455] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From def7cd19173605402146fa9787b8c92a32aa805e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 414/455] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From bab94e059e779a22450566265942c448a43fc230 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 415/455] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e0a5b7f93bd822756a015c3fdd937c585ea7b4b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 416/455] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From a540cb5d7124634018ade61222110b4e146f8e1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 417/455] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ec0d01cb0a4d9c70514770d8ede0b364464d2f00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 418/455] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 1e810705063dfaf251fdbe8e04f6f23b49a22136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 419/455] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 0c5bb949bfad1fec0ee0cd1c0d6e18dca4b6af05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 420/455] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f3987873d04492dafc76af2a8b28e1cd6324c150 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 421/455] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 67d4954a663a4e00112acfe9e09cb6ea349d95b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 422/455] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From e541f11f4b673025055a030be3f64f83e5f2f907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:00:19 +0100
Subject: [PATCH 423/455] rkt: rebuild against OpenSSL

---
 srcpkgs/rkt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..0eed248718c 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -8,7 +8,7 @@ configure_args="--enable-tpm=no --enable-sdjournal=no
  --with-stage1-flavors=fly,coreos,host
  --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
 hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
+makedepends="acl-devel zlib-devel openssl-devel"
 depends="virtual?rkt-stage1"
 short_desc="App Container runtime for Linux"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From 224a4f4ca55cef409ea086a618c0f5ca23cf40bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 424/455] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 3965bb1d1a48d4d5ebaaa87e28ec6ef2bc53c766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 425/455] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 8c24541a4696ba52c0150ce3fc6bd08dde29c23a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 426/455] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 0d594bd7ca898cf3f470b56ff2b3d8902002c953 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 427/455] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From c030ca7b0dfa9c04473fb89a343b63c1e8fffc89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 428/455] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 04b171e959ca9cf4052680b380975ae4010b14e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 429/455] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 93d1ee2dedf997e09e47ba6620c12b6ab1e96fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 430/455] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 554113915a475b38314c11c8bf8a6de9553540a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 431/455] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0ae57e2e29d50456bea12016498c174cba8b2bea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 432/455] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 3e957d178816753832a43411987334cba47d31c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 433/455] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 348a1af5b8b52b24ccb00ef043d4317db6e85b14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 434/455] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 84022ab73449a220b5ca8e45e39e13adb39be0b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 435/455] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 8b96abde68d0feca8b55f0e0ed8d5854865191d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 436/455] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From bc36015bd41f31ff3a581649c5076a30c632fdd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 437/455] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bc8bdd03f97affc237d4f3f7811a9512e36d8286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 438/455] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From ab2e481a3f027a5b9c323c07223d5ffd0c6ae252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 439/455] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From df77378c196224bdfb943fa13b0837c78d844b9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 440/455] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 4b8a59a50a647aa81bac4468fe71556470293997 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 441/455] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From e510f0cc0ee1f3863ce10457c7d878480d587349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 442/455] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 2376abd064658884e5860c0f193865dc6fd8827f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 443/455] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 8f463b782f62b407720656997244c4e4e09076a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 444/455] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From 7bde1c448c1228e515f84b9bf7929eed5d7eac8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Jan 2021 18:56:22 +0100
Subject: [PATCH 445/455] busybox: rebuild against OpenSSL

---
 srcpkgs/busybox/files/dotconfig | 4 ++--
 srcpkgs/busybox/template        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index b3c2a607ecc..83f96b79b9d 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -50,8 +50,8 @@ CONFIG_PLATFORM_LINUX=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_CFLAGS="-I/usr/include/tirpc"
+CONFIG_EXTRA_LDFLAGS="tirpc"
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_STACK_OPTIMIZATION_386=y
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 63d7aeb7ceb..8bbe88d680e 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -3,6 +3,7 @@ pkgname=busybox
 version=1.31.1
 revision=5
 hostmakedepends="perl"
+makedepends="libtirpc-devel"
 checkdepends="zip"
 short_desc="Swiss Army Knife of Embedded Linux"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"

From 560c4a1bc9645485f426f68b8e23f9b0e25c46ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 20:25:45 -0300
Subject: [PATCH 446/455] New package: libretls-3.3.1.

---
 srcpkgs/libretls-devel    |  1 +
 srcpkgs/libretls/template | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/libretls-devel
 create mode 100644 srcpkgs/libretls/template

diff --git a/srcpkgs/libretls-devel b/srcpkgs/libretls-devel
new file mode 120000
index 00000000000..9587ad2c40d
--- /dev/null
+++ b/srcpkgs/libretls-devel
@@ -0,0 +1 @@
+libretls
\ No newline at end of file
diff --git a/srcpkgs/libretls/template b/srcpkgs/libretls/template
new file mode 100644
index 00000000000..c87b5925166
--- /dev/null
+++ b/srcpkgs/libretls/template
@@ -0,0 +1,24 @@
+# Template file for 'libretls'
+pkgname=libretls
+version=3.3.1
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Libtls for OpenSSL"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="ISC, 3-Clause-BSD, MIT"
+homepage="https://git.causal.agency/libretls"
+distfiles="https://causal.agency/libretls/libretls-${version}.tar.gz"
+checksum=f23a29ef321eff099b8fbabdecc3a3378cfb9eca24b2bf02062554e9779c4d33
+
+libretls-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}

From 1a161db658b937759dd131838f046c2b00438a90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 447/455] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 794f3db1c1660f8c59049658bfbe6f7da938b5a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 448/455] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 70c444eb766ae337c6d2e8d903864e41b44b7390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 449/455] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 2d44f39837d4e76c6152b033c23cc12d1ea70d57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 450/455] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 97338b32c0d075469ac0fb97b1a8f9eee8d1792f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 451/455] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From b6677365096fe5472f076c5f238f53c086a13d2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 452/455] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 8163f698373a55fd1b0aa1b91952f362a9355893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 453/455] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 094a78876df852c2be95b4ffbde24c790e9e0d4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:19:42 +0100
Subject: [PATCH 454/455] calligra-plan: update to 3.3.0.

---
 srcpkgs/calligra-plan/patches/QPainterPath.patch | 10 ----------
 srcpkgs/calligra-plan/template                   |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/calligra-plan/patches/QPainterPath.patch

diff --git a/srcpkgs/calligra-plan/patches/QPainterPath.patch b/srcpkgs/calligra-plan/patches/QPainterPath.patch
deleted file mode 100644
index 519e5223fc7..00000000000
--- a/srcpkgs/calligra-plan/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libs/ui/kptganttitemdelegate.cpp	2019-12-12 12:48:13.000000000 +0100
-+++ src/libs/ui/kptganttitemdelegate.cpp	2020-09-01 17:42:12.663608718 +0200
-@@ -28,6 +28,7 @@
- #include <QModelIndex>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLocale>
- 
- #include <KLocalizedString>
diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template
index 33624411041..75d1fb8de58 100644
--- a/srcpkgs/calligra-plan/template
+++ b/srcpkgs/calligra-plan/template
@@ -1,6 +1,6 @@
 # Template file for 'calligra-plan'
 pkgname=calligra-plan
-version=3.2.2
+version=3.3.0
 revision=1
 wrksrc="${pkgname/-/}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://www.calligra.org/plan/"
 distfiles="${KDE_SITE}/calligra/${version}/calligraplan-${version}.tar.xz"
-checksum=e10c6f4a6fbf40da422d98d5138201f7db52236181c25641402e4ae4b0add336
+checksum=9a97414f2207941a70d93ff096617365d35379cc93a09cfc19ee532d2905a9d8
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 perl

From 7abc962e41746366799fa158777a3e0f4ad8bcec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:31:57 +0100
Subject: [PATCH 455/455] kdiagram: update to 2.8.0.

---
 srcpkgs/kdiagram/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdiagram/template b/srcpkgs/kdiagram/template
index ef8f6c1a86f..933a8af5394 100644
--- a/srcpkgs/kdiagram/template
+++ b/srcpkgs/kdiagram/template
@@ -1,6 +1,6 @@
 # Template file for 'kdiagram'
 pkgname=kdiagram
-version=2.7.0
+version=2.8.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=63a2eabfa1554ceb1d686d5f17ed6308139b6d9155aaf224e0309585b070fbdd
+checksum=579dad3bd1ea44b5a20c0f133ebf47622e38960f9c7c8b3a316be30a369f431f
 
 kdiagram-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kdiagram-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/*.so
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
 	}
 }

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 471115 bytes --]

From 3735f3d457cfa31596b39d8bb77e6a425c564eac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/454] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 70596feb769..72892eb6b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3505,7 +3505,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 8700df2e7705f051809c1de7beebacfda6463d33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/454] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f0..a338e53b1e4 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.5
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From d2b1ba6a9244c44a06b890f5667dc3a632cedb24 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/454] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 4cfbcd1bb9d61c2682de4317838c36bd16a5ea55 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/454] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 57959706a54..62a4c618cac 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.2
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From af06f689ccdebe5b39de6f5402ef8255c6574387 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/454] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2b2a04b51aa885f703d070f1b3c63eacfd5b1bde Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/454] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 72892eb6b64..c095b3966c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 7ced7aa54ba12ecbc2df3c83153597d40ee7d534 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/454] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 2f5a876cbbc57c1216a2efe260aca02a71af86df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/454] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From fef683120ddfb14e3eb5e5291705216e679a976c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/454] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From ed39b932893afbe7b8ddb78cee0bc8cf18198703 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/454] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From c4d2e60425c576df3f4f4897c74d2df670ae53a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/454] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From bf9c66186695f8e6b0f92eec135cc55398f0eb39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/454] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 5146d3159b70065cf36f4db28fea2ae2b0e03ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/454] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 8660bf16e4c2ba3ec952555fcd66d9d4d354e7f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/454] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 5046718d5732c87d7db757c892c908e130e8108e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/454] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 55718a31e2f41f0cbe266c9ba6f6a95e14d2f056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/454] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From f07bb052d2878c67f385024504a601f71b68ff7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/454] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From f81dcfee42b43c7c611f1110070f2457b8e41f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/454] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From ac43cf1c3347f30c1ba2a6afe6aae5bc90c8338f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/454] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e8be30ab1a733599a2331e6d850e96888248cf2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/454] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From c42d420916e914f4b4ddf95aca2f600082bccb20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/454] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 2d0793308307dad6bc5864c6eb452ffae938b9e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/454] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2f8b66428b0cc7d833010efe96866d826edc5430 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/454] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 89ce9ace6e2566acc0d3d54e365754ee9c920d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/454] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5a13d02e49c3462adc8740edd9dc380382f4abf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/454] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 61de217642709d9ab5c24f85c8004c17d6662215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/454] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From f93b87cb562291879fa26422a7d2923f493c9f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/454] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 1ed87b00fa8b2204577d67f7d3a18ae7bb6621d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/454] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 5d2eae7746a8dc41a26c73bda62805d8618ded31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/454] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 6e31eedf6810622108952fad87da5c0ac9ff8584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/454] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 6f768197c6d3bedfce60344cc4a3a9fbed9ef41f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/454] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..5951cad55b8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,10 +1,10 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"

From 76c61f63a2df9981b1ccb2abfb698a7cd78d39e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/454] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From f89d38bf4ee8ff9643dfd7577765c3df38d2dafc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/454] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 561a5ffc395d355589ca971e1643cf308c866b24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/454] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From dfff121d030d32e9c1aabcf91b0b2a2603169981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/454] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From c831fd631b80a3113bb1795004d5c44f2b21347c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/454] burp-server: rebuild against OpenSSL

---
 srcpkgs/burp-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
index 85cff6602c6..c2853cea7b3 100644
--- a/srcpkgs/burp-server/template
+++ b/srcpkgs/burp-server/template
@@ -3,7 +3,7 @@ _desc="A network-based backup and restore program"
 
 pkgname=burp-server
 version=1.4.40
-revision=12
+revision=13
 short_desc="${_desc} - Server"
 maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
 license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later"
@@ -15,7 +15,7 @@ checksum=2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f
 hostmakedepends="automake libtool perl"
 # note: burp provides its internal copy of "uthash-devel"
 makedepends="
- libressl-devel zlib-devel librsync-devel ncurses-devel
+ openssl-devel zlib-devel librsync-devel ncurses-devel
  acl-devel yajl-devel ca-certificates"
 
 # unique binary for both client and server: server depends on client package.

From 1b149e3f87d201f52b3fd64bb6346b15addcc79c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/454] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 69cd5ea44166ba83b832200417b566ee9e608cf5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 038/454] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From beb5bbfe69863fc0efc623c587307d9cf9204654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/454] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 4549525dcdbb9f1d528833e6c36367f776c8b27b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/454] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 97cdd1557a0889f60ba01178550067380e8945f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/454] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From b49b47319cf3c416fd30503757112328b6ee635d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/454] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a4236b85fb8e39ee574500b0e476bd5133cc1335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 043/454] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From febff34bcd83a0d6bc9bbfdb9aa57302b8c0938a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/454] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ae3b0670003265ff1abdc08af56e9b5db6498780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/454] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 193ccd8553c88cfcb65600c4af80e1c4c977c7e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/454] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From b034d8d55185e3cc2578faca32b37ab6245f3aa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 047/454] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From dbb863cef3799a3c27e7b7372cd09fec7e6c273b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/454] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From d9f474bd680a511b3078410a99123533c8593257 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/454] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 25fa2c0cc106ab929702920dfb02938fb03a285d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 050/454] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 7c6908e5effcfe9a2b74080dd9069c20236fdcfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/454] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 278025eee0fb8c48832f6af3b0e7760d3c556a61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/454] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From a0b7b473a76cdcb1bf98946f8c7db2201b44c364 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/454] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 54e29472632a4ff860ac1bff4916f10f55cff376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/454] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 1d7cd4e4510c07934469a8f608879793da257350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 055/454] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 1cabfff552b57de68a69c6b7f036a6019f97a53f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/454] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From e88897f3a643f43fb2466302f321eb9088db4e64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/454] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 620e4681a1958cb8587af261d4755ff42a41d96a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/454] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 30c2939e7531b3beb3a47b2c8b163c64dc99b6d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/454] dmg2img: rebuild against OpenSSL

---
 srcpkgs/dmg2img/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2142d7cbcf835d39a6e39a46dd60949077b52149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 060/454] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 00a037d10517d5cf141afe1485564b28bd1838a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/454] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 93aad6428c6f6cc9b673ce3616931cb79511adcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/454] ecryptfs-utils: rebuild against OpenSSL

---
 srcpkgs/ecryptfs-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From a804bc5148f9633d32ddd639b9139871f0f55693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/454] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From a270d7a33df3a471e78a7a5c008352ef660def24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/454] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 84fbc92d021622c7afde233582f79aa5f4268eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 065/454] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From faecb175087abd33cc255d6ab8987f5057f169bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/454] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 8fa8695fa67c80070fb1b45faeece3639104c556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/454] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 9c908c471e453a4491953806f80afe8f0a9612bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/454] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 95758821e4717bea2078c21f99baa99eca5619c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/454] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From ca2923807de39c94e3704cc61dd6a11914ba6531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 070/454] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From dfc9a1de330ea7524f7be1b835f59a11b08df4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/454] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b608fcb2a9ad3583e38eedee9dc3b53e13627496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/454] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From be819c0fe48660a1185003b175a704d8422d3747 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/454] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 15b168c4d5b97759758d5920336d3575079d8f12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/454] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 9b33fa58243f811771677fb13a877a9f86b7b825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 075/454] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 9b353e0a5e60f04c193fd92ef399d5b472c39ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/454] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 44fb8bc12a03d74eaeeca5a340b98598eee3f2d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/454] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From fc040a2dd0d41df3f7ead9ce1690fcd381c8e56f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/454] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From d8983c851685b6d74c0278da08892ef95b125018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/454] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From b83bba77156118040860df2ba58e51c50337de38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 080/454] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 3a9ef7115f1d5a336cf881d45a3d5f4a0a8c0895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/454] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From feb993286004df0d98b619b85fde53a0d153bdde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/454] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From e54cab7de13a52cc1bfb8b87d98d29dd51e22b88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/454] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From da935030659818cee542e2ed6824498b3abe81c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 084/454] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From a8831baf6699b4ca9a150e7d163ee1ea8fa3dd6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/454] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 02b76ffcb858b21900532d537e3b1444498408a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/454] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 1a1080260884a7fb9e3a30f242200fff35855c60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/454] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 919aa9f6c5cbe15cf5cb5b505947a43739909caa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/454] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 4f849aafaf8356f2cb913ce5855148e675f9ffb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 089/454] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 635ce23698c7882fa460bbd583440179fb48c081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/454] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 17a144e12ffed9d8d7c2f0c3e142cfd43b34b7ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/454] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From da03640b8a332175dfd97935151160f580f634a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/454] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From df2d2d1194e562b5d9a6c947d6dfd8aa9f90b402 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 093/454] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 2fc3a248a1ab29a23d8681003ed09553ab97245a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/454] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 46011ba9b82abc26f14cc040bbcd2a360a8d44d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/454] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 726ef692da15f74b1b3e0597c1b12d04fff1bfc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/454] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 1fa279689d889bdea9a94509188e95ba2fc49f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/454] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From f08eac7c4216b235a38e831676c15c2e17e90c4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 098/454] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From da420a2ab0b48261de1cbb6fd741482de537598b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/454] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From f438b0ef3bc7072e79a1720d4b4b7d599f0dedaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/454] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From e4adfe19845b5e776e5e73f96d5e94e77f8168be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/454] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cfe3d57e77138e05639caae62b7763620bf53657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/454] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 7e4660aee06c050367fcc9e97175cff8e205a738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 103/454] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 9f0b35c7560f1eb62cbdc7017da6a5061c2ecc96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/454] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From b04a1144c3a422783f7a178e85841f98cb336be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/454] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 59e6418c89400802d823b7681a45be46e79431e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/454] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 20e1b6b27c0f14ac0908bc895f47335aa701cec3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 107/454] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From e13bc9b26517572ee3eb3d3b962943dc4a1dc7dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/454] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From ec705db5aa99c216ad51ee44492f76e66465d780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/454] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From eb8a7733f6fd9f3c78198dfa702d62d7e3a410cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/454] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 9c14c9baec2f53ad3a53adc261e801e1bb2db3d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/454] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5dceb39bc83b9a6aa267ac5bb3b156e8bbf68c3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 112/454] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 32ccab0f6b1ab70db7334b62ac286d4e7d2146f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/454] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From c01d87c634c3dfc64cff5784c5942167d5fd3df6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/454] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 54ba10a93f4f0652d37a3e619afd38d7598aaa68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/454] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 94cf8bdc2dc4b14c1072db0e188206e8482f2661 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/454] ipmitool: rebuild against OpenSSL

---
 srcpkgs/ipmitool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 6fb061f0f2d31dca518ed019fc0bee069351816f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 117/454] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 2598ab642ebd7f7d9daf3280bacdc7fe6bb56bd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/454] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From f08344fd7d14dc3a2a0ce5a29f625119883d1d20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/454] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 65ee7bb3d5be922cc20c31eb01e9f098a1d2500e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/454] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fb7d9d1097f366ce790b36cf5c3a701a112d1f3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/454] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From be7352cfa41a815eb1d58e14a73e9fe302b98687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 122/454] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 23603dd874f69e8adee05fb818674a469af50fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/454] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6d86d09fc8f864a30e8f504615bd60ff75323792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/454] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From d3b113917cb3a40aae7b109e596bffbb7a868634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/454] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From fedeeb04f17090d6637753d7a816245f0084f346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 126/454] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From f492da93502f0ceb17b30b366e60ebf0e66f9a76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/454] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From f667f504c9dcfaf46cb68576ddeaa21759e5e7d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/454] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From c73d5ca57707260735b1768d0702130c357e053b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/454] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5010720548c1c14bcede3f478fdd0b38fc372430 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 130/454] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 0101ccc6cc5e7a4d4bd3957f306b7dd697d0e4c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/454] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8fddd224041add9ce27ae27efeb9b7c7a1265a6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/454] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From e3a8459912bc0e4ea0b8f41883be4e20afaeaefe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/454] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 516b191bb0b91f666d751cff76281c749e32d77a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/454] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 782c39ab46d7c82a41e95166f4372fb2255c0e7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 135/454] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9989efb85f43a391e8bbc042369cb3880d5997ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/454] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 68c89168c74fdd5ff29ab5ed4b2dec862d511ea8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/454] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 4015bcdeeb9c6a980a542645dad2e6dc34794ddd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 138/454] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From ef70c2471226fe0dfbbdf60c96ea34611c203469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/454] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 170d69aa2a16923a8f0466919be745e87e7683d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/454] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0f60d70baff1ea597ce041f93ddf9461b1bee97e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/454] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From f9f2862c81a02522fbc3914f296382f777691454 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/454] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 191e371fd125f15679d7d0d3a0244a028b4f62a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 143/454] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 2fcdb929c6f0258829438d3e2f01ed4855a40b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/454] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0018857604b627ff09ce15f597dd5c1eb8aa4b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/454] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From f611ac5f68cd27ffa3556d3633f3e34d472050d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/454] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 30d12d78ecc31368330834e40267c77126846e4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/454] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 870d16f9174021baf74d5334f9c9c6c09fc53bb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 148/454] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7ba07df8870ce34437f8cfecd56474d13ea6874b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/454] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 89b6f0c616a7696af5220e8cc64920b9bd95d29b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/454] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From c18cb0c7476657aea47aaef2facf3df2fc667e83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/454] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 649b7c55c286ba83410a42789f2c0a7d8e78f6ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/454] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 95eb7ab0c8df3a45df5937b2e033e91820382372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 153/454] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8ed3f2c4824937819d01babb98cfba078a3f5a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/454] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 3648194a8c616fbecc9bd94b079f492377c9dbab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/454] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From aee3226050e78c2b4223c2b44d9203f812879aa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/454] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From e2a139db643eb0e8b62cdaf728a482eb6b203b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/454] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9ba4db307314966f0954a5a98cac8a540d8f0406 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 158/454] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From f0e1e8088f3ac8d489e96373649a303893265d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/454] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From d24da535a6e82d57ff743e7a8e91c50e6570ab0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/454] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 205c7c86af1dd7a926b1818b51e471cfb27bc138 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/454] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From fdebfd3800f6eec5cc18b7981db4cdb89f1a8258 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/454] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index e21433f132a..31fa1129a99 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c905f5a2204ba065fd25a7afe03edbc51292fbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 163/454] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 1bfa723225d7d4735e20b2ea4bbceb24b61b54f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/454] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 75d8e5d8d53..bd6e2752599 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 6c3a182b5e6aa4883fcba41ab53ff5888d0543ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/454] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 271d1ec596e5b6d2e414bd3ddd27880ee3f727b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/454] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From a74f87b50a836a84a1da1945d37e45c503284416 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/454] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 686ea6b204112ab9791a057b884dec2df55a81f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/454] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8b3e3c95700f6c8fb24abcd28488db99f919a84e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/454] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4c1b7ce19a7bd2561946797a25fac6a1c43bdc02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 170/454] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7d1d2b4187cd3c5a5287aa783399b722fd852cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/454] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9d40133aa2c8deafc68f147931a27d56d46b0374 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/454] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From c1b242e5c8138f529c02147265f3bbf42f631bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/454] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From b0f611224e75de02d49040c6474b24710f401f33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 174/454] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 1c78e1d0a1a2ae1355e4e783e94e522e3b21067e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/454] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 7a3e4f3038ee2d41b19930bf122d174087acf626 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/454] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From e53353f3eac96230e6a963a77b44d4855da36c9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/454] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From e25ef08b0e63bcaeb79c3b68f79a90489ff115f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/454] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From eea5980183ae7072179e1c8b490e49d87a8f0f13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 179/454] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 50f40a05a582a6f277bdc81bf28a9cab114d03cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/454] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 745fdf60f068e1c5839514cca85641e165d6a26d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/454] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 7862bbeef5e02cf765e7a78f5f75838d76a2f377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/454] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 9d614c47c540fb77316b6e4ada4a3d34d530a174 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 183/454] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From f33dbe709e87148ffff461bf7b26758ac5c17a7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/454] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From dfcd75a65c7bf30d35dd633230dded4e33dc00de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/454] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 9d6a23ae6b5e377d4ef23851a9d896e08419b538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/454] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From fd358e8eb5533cafc8721a68a712dd9417a17a15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 187/454] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From ac09adcdb3e37451006063735b5cec819bf8a53d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/454] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From ddc0497738b33c495bbbd96af9ed9f43c7f882c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/454] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9557bbc90a41452228f08a9499368c29df8d1a95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/454] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From e09f62c7a78f535694991ac0ec6bd2f365943d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 191/454] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 6d37381aa825eccb967d363cb0b1f26e2aeb5a20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/454] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 639601bbf08fa9691f855cbb8bec5a047a610c48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/454] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 66e40086d2ba16d9e9f1370c24f7861cf5706f74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/454] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 0eef4db8dc5dd35f571ac8b516ab55a9b800bdbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/454] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 01d25e315235ec8ba006c8c77e0fc00c398e3f36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 196/454] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 39e30f8a6a34daec54fbcfc24f43e54a4ff318ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/454] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 771a0e028d0deca244b37bba4aa8bc031cc06394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/454] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 872ec1df02172c666911fb6d0e5065e6c55f3112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/454] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From a64c6f0838fce0a4aa3251c04acff9291848eba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 200/454] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 13a8b5af2a9b40a4bf1d620bee21a341e0294ee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/454] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 07dd252ab8af5a4ed974704340f4ccdeccbbfa7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/454] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From fe3f86f5c2f12878df0267615bbb2b37704d34f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/454] netpgp: rebuild against OpenSSL

---
 srcpkgs/netpgp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..3ef9867c3a8 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"

From 9270f3758dad7b39fb1b968770fc962ec46b52a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/454] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From cbcd072d872536316bc5de96c999b449bcf985ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 205/454] network-ups-tools: rebuild against OpenSSL

---
 srcpkgs/network-ups-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 530c9a9916603afb592e958c9f795bc464ff8ec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/454] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From a914ed3e61366a8ebeed8d5e6d5e871a7e7205a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/454] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 158885bcbc77ab0de48cef8fa2f03fce6382ecb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/454] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d..786d3992ce7 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,9 +2,9 @@
 pkgname=nginx
 reverts="1.17.7_1"
 version=1.18.0
-revision=2
+revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ad81ce8ca9be2997b3aba3dd3d0cd79bc08f0b96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 209/454] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bf75c38f78e1546c1afa687754df848c342686ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/454] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 0a7e61b7e800733dbcf19ef05b60bd478f1bc7a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/454] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 821546400d6c58f4537cbb7e7b651f9f8c7f0c08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/454] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From fe47ddaadedc4f4789ebdb0df412b5b47c0486b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 213/454] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 345df7aff45811eadfc5065b63a628ff42d1ce79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/454] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 48b05844b06e8292468ef44cbfc9f3f20a99a5a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/454] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.21.0
-revision=1
+revision=2
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
 # remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
 wrksrc="nu-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a7d2cef1d14c3cef5778b9b256d0095a28e78f43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/454] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 6e1f3f73565484314f627cad9fe38b1d3e083d4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/454] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 4e38f2964f24310c7cd6a72aeb16086d9f73f2c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 218/454] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 48113ad9de9f2e8cacd8c445a71d447e5f69b1e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/454] opendkim: rebuild against OpenSSL

---
 srcpkgs/opendkim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..7c46b9f7a65 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"

From b9e9057f4139f1ec566735c35c846a606b050cda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/454] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6f..5a50ab3f5c2 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 7c0f1c05b01690dd33b34b2e49d5dda71044cb30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/454] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbc..5b47c649eaf 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.52
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 0d2ac285ab7a540476029240f5c0bfc723accee5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 222/454] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 8c9cbad52c3943f0843ddf8910e92dd054df2a3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/454] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..b582821ccee 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -19,7 +19,7 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 27bb68d7606a63ab330f412858d2f501e7caab20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/454] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 9bef766575e40c1b4f7cdab6e667b52c3d76e020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/454] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 7090f1f0c9fda734d7c947dc56e67f5344c5a6e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 226/454] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 720f9f3daf7e351ff25f154bd2f471697c3fc554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/454] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..dc1552b8fb8 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"

From e6d5d04de9cdd6bab1630b2c8a138001f984330e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/454] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c79eb6ff65b7a376d62a8393d2a1cee0091ac44a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/454] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From fbe8a2848a1fce67268d20f6b00d72425daca90c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/454] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 73aa1ec24a82b284e74cbe554ea68f26acace294 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 231/454] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From e2d1f5805600627b1983b29e9386bccb3edab97f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/454] pam_ssh_agent_auth: rebuild against OpenSSL

---
 srcpkgs/pam_ssh_agent_auth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..a4e09ed9584 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,10 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 86fb7e218d9ea316bf9193a9ef8f924a67cd38de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/454] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6db9a7e94400ed7a3a277ec83e6dec9a0ac6b122 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/454] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bbe97fea53b346706a184e26a139d8fb2939d039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/454] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d2fd34f95bbcab5d429bb7996fcfb8c68ee5a6da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 236/454] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From d6addcabd5a2af75b23a9fc26cb031c57cf1d6ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/454] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From d7f90b322d386e7b15ba367ea32c7552ba315dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/454] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From b7e3714d72200ad366fd5c0d4732063f4a8e21db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/454] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 84e121bfb689fd47bda2430075e626ab7ca4f5b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/454] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 489bb7aeb5016c70895a0261b0a4cbddf1465a0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 241/454] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 24f147e756c8827432a9adf71f2ceb957fa48c53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/454] pgadmin3: rebuild against OpenSSL

---
 srcpkgs/pgadmin3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..7c63e3bc5e3 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,10 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel openssl-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"

From 2f239984fe53eb13ef89ac85bb0440dfedbb1a9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 243/454] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 21e3bad540715beab2123c25bba0b48e3d1b8a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/454] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 069280d10d38af0e7542b6cb4a13d38a5a7263eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/454] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From c79e925dc0df596de0b9b0daab627f3e3c78594a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/454] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 2caa3497e876ca441bb9e3007a4818b043129f7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/454] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 259ff9b4ee4f850008d99488e9ea141655d37677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 248/454] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From f0ad5406068e4de9a907f1fb8dbdb4662bfb2c39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/454] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 40443e24f5dbd420e29d89a85eb89cbb8b7422ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/454] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From e30a03b83ff58f475e3661da02f5e31725536516 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 251/454] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 2d838fc350937b8e9af0d53a6acb361ddb6d5a05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/454] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 660cd4b01e7e28d0e63249d15f1112e20994f788 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/454] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From e4f0ffc02c651aaa343fd8d2bceac05b3ae121f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/454] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 41d5681527c5c1be3152366f1e4abe86a5354324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 255/454] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 8657ba52e0291a125c303077249a9a968acc57f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/454] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 01e3f4944845e07a817669784c26558ca53e2a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/454] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 17335bd514c172bac070b4ac5e7ae8ba817285c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/454] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 84939d6a17d5478d8559079fa212cae0c0e022e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/454] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 26a7b90554c2fb880e32d4afbc514964bd7c652f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 260/454] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From f259d1955d9dcca638f25e82e38a0b68ceba1d92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/454] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 5eaddbd6b1b9e5e8e460f68260109f401e5ea83c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/454] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 8be64575cb722c862e5992eb823893daa9b5c0ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 263/454] qingy: rebuild against OpenSSL

---
 srcpkgs/qingy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
  $(vopt_enable pam) $(vopt_enable x11 x-support)"

From 0fc20b283e91b0e71406128370513dfcbe16d450 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/454] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 12b2129ff80fd7b35a3d5d315fcfcdb00d5cb2fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/454] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From e14aee765bab01e1b8ddd8f13aa3ee58a51f5e5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/454] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From c74d4b8049c4703de5240e9fa55176174d03e701 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 267/454] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From b604bc169946c54583915fe446d3adef2a4c9da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/454] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 507e57bc8ffddd7755c41001a2d2ae763b0c7f01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/454] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From b4c67e756d24af23ba3e4dbbbc0f75585be52a9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/454] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 904f0b4e6a78f01dcb285b23d69860c1c47897ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 271/454] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From a9335c05fd97f48abb0de0dab2e626049e40f938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/454] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 52955a1bcaeff81bb791ce97d2af36b31ddb2613 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/454] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From e9c2dcf2960e3155107484c7d7fab5019d5ce7eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 274/454] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From d98c82c4d54c0c99719249df2ca8bddf35ea2985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/454] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 5904e1db015dd5c9547319841404416835eb4fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/454] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From b9ea91b29e130fe9fa34bcd1823ba0feef260635 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/454] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 4e5d5ae86c121306e7dda0e00b210893b40cb24c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/454] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From fdecc99b89eb37b5c84cf5ce54bc588becc6cab2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 279/454] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 19e59724574b81196bf651c7e19bea4224c2df2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/454] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 49daccf043372a8b97c209726743bba6c72287e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/454] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 6fc213fce3323e773e4a1f1dcc64c4e8cd245986 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/454] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 33cd13170ad786c74550cb8d1a567cd0f86eedca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/454] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 1eae2768e286dad5b60617c5fb13b103c4529339 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 284/454] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From f29d471ca1d5d3011fc15a1a7c16914687e3cee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/454] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From b4e54376861edb38b0d2c9dabb38dd1cf6d3dcfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/454] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From fb770423252df02e8e9f1550fa9a152df4d0e874 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/454] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 877ad354350e14d150d206fc70a0c412c59e2bfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 288/454] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 4ce41fba09e38f6a7f095f67f0748a7348bd587e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/454] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 4abefa20867dcb1c84b52f6e0357de3b7868f404 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/454] sitecopy: rebuild against OpenSSL

---
 srcpkgs/sitecopy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
index 5fc4d36362f..4a8de6f0db2 100644
--- a/srcpkgs/sitecopy/template
+++ b/srcpkgs/sitecopy/template
@@ -1,11 +1,11 @@
 # Template file for 'sitecopy'
 pkgname=sitecopy
 version=0.16.6
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--with-ssl=openssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
+makedepends="openssl-devel neon-devel"
 short_desc="Program to easily maintain remote web sites"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From ef65fedbd101703985238dcb8bf294ea51499080 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/454] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 6825512f96c37ff0796189157da12d6cddbba4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 292/454] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From d6ff816ac5252f9c5bb7f597400dfcd1b63b3e73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 293/454] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f2866695330e8770e8a4518c60a071e1ac7a48e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/454] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 01097b51480254be7aadf0f6f74887085c60c7a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/454] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 731aa716abd37db50e33cd29b5f4f5ddd1d4964f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/454] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 4a7f413d00ab929b576ddb62a441786a91ec7bb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 297/454] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From fb83add2b500eae2d80c6f6c6360900f22221831 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 298/454] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From f305de396178832b3117f7913e599aa74449dae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/454] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From be9ca674752bae909c7f9bde613e0cdd51110439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 300/454] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From b0e880fc900ec29c7e9c22090feb8d276d860c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 301/454] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 75512aa44f382d156a4447b9c78395908689ef3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/454] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 5ecd31a50821d696c7a6dbe3d0523ef164d4dc32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 303/454] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 3ab3428e0842c48e0b6741d26968097ff33896cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 304/454] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6f4ca9732f227d0548faecf4363cbc2f59c7eb7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/454] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 559f9aee10028f9557b2b2a8a6378dbe8fcbe66b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/454] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 77840832d30fa06df6c2906094d7a25684ab0952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/454] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 5e6c543a2458dd5970ec9a717736c301331fe636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 308/454] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 5a3325741aff7feb340fbd60abc2e751e61d0825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 309/454] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From e0395393be5810d9e07407d5517f6289f7fd9f16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/454] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 923c1d581f8ce59eeef52f21d875d52d72f9713a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/454] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From f0f425c003e5a47ef8833824285f4314ea24b700 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 312/454] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c0292a38ef5e7f89f715a29815321bcdee0aabce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 313/454] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8cd4104bd055ba786cd48273f55934e8acf7d12b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/454] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From ea775c65f862a159ad327af19db471fc4dc06bfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/454] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 89855b24f2a581d0153fda89cf65957f4369cda1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/454] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 4501665d18af9b933184a35766692eff6287befa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 317/454] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From c7f26677e127d95167ef4acbb85001585fe1d237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 318/454] telepathy-salut: rebuild against OpenSSL

---
 srcpkgs/telepathy-salut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..367ae2b7803 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-tests --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ openssl-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 77ab0889abffe5ad74628612d1d704ae08667e63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/454] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From d576c07ab96db988d62aad58bc7e321c71e1deee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/454] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bda07be0b3e1f57db7b24c8f6610d25e3a0ae0a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 321/454] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 64154aa4511e689b3feb377748f6c076a19b1548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 322/454] tlsdate: rebuild against OpenSSL

---
 srcpkgs/tlsdate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index ccdbef1a5d7..aa3b54b4c6b 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,14 +1,14 @@
 # Template file for 'tlsdate'
 pkgname=tlsdate
 version=0.0.13
-revision=15
+revision=16
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
 conf_files="/etc/tlsdate/tlsdated.conf"
 make_dirs="/var/cache/tlsdated 0755 root root"
 hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
+makedepends="openssl-devel dbus-devel libevent-devel"
 depends="ca-certificates"
 short_desc="Secure parasitic rdate replacement using HTTPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ae4afaa53b8748a292ccde70661e024943bd13a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 323/454] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8a6cbe64ca44b061407c86aa1531f8e9553585cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/454] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 01163232d1edc0463d14a0dc5718abced8299144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 325/454] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 712ee0f613c0eaf3ae563d0969dc8526108e9bc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 326/454] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From c34db092dfc2b66e4afcea9ea606679d395380cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 327/454] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 9427a11a281da37f1d0cb29363f62389d5994ca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/454] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 5a69669a531cf6ddd6bbf6a2e94ca29c0c368ada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/454] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 5e3f1250a03759b546d110a9bd9a4739555a8aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 330/454] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 853753855f4fbc61f9afb57c033d36c08fe4c890 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 331/454] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From d99a5709f9f1d987127002d9bcc53df15ef0ec5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 332/454] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 3ad75969285baaa3506d5f772839f1e9717982e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/454] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 7a6d2c67c15429dafb0b2f4c89c288ed8f3c9216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 334/454] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 7051678994e5aeced24c877b691371de54736a78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 335/454] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From c548a86493cb0a0a342a5e4d9d7b9c63fb195580 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 336/454] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 5bb6f9c4bde..11a8b09b47f 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,10 +1,10 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=0.22
-revision=3
+revision=4
 _commit=9e04497a127aa6413463ccf4a4aee75f0d581d92
 wrksrc="vanitygen-${_commit}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 11ecbffca6259610c4158ca8e23acd1590c1eedb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 337/454] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 44f2ecc6e39415dc01dfb9f6ad15fc512e607aab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 338/454] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 2a1f033349f4885445ea4172664a15478a4e08e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 339/454] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From b1b9a33ce0790ce812e358bf5bf65a76f11e01c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/454] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 0669f883490344d78ba6a549132e29d680609da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/454] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From b3fee9d680237c6e5f81cc990ae962e6248b8de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 342/454] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From e8992a960763855d297ccb5be90297e8b14aaf69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 343/454] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From ca585e41c40be792e671e0547268143b1c99b849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 344/454] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 0bc11fceb17b012b04da89ad6cbff0c4481d190e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/454] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 74d24310e0f57c4ae36231aaf74907b3be301179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 346/454] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 49fe6a89170a2bc41b7a52277bfa3f2a90678842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 347/454] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 4e69e4087db995d619513e5e6bc3cc00c43317dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 348/454] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From ba660453b708793a67ec574328f5f59d6c1d2584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/454] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From a948f98f0a6aebfffa507f236f84d6ca398ad335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/454] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From a5c0cb637485e879f7f343628399e7407d501ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 351/454] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7a1732f67034cb188dbf81b98741e3b859904322 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 352/454] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 372675df98a1ff5192606506a8ea572c422271e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 353/454] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From aecdba23e656da3993d028849ec4534bd95c8edf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/454] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 396d74e90a872ac6e29887afd44a6ae59b5c8a5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 355/454] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From f4d47076276b01e5c416f03734118a60c41e4946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 356/454] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From b5b8f96f6b78d03088af1d90b69a3bf5eb5412c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 357/454] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From ce1d4eea5af6587e02eecb0db274839abc880262 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/454] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 9ed3ce4c48daeca32850f080860f555ee3106001 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 359/454] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 93dfae7513b8c78579d8d97a7c8d4d84c864d148 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 360/454] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 33e81973b1ff3e2e6849f30c613f735faed6e84e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 361/454] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From ff933979ff32bb4844959f37fb254a4ff642c3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 362/454] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d4016606376778d0d1f9b25aadd8d5c5b0869155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 363/454] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e48966d39733c2ccce36cd6fe080334853409df5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 364/454] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 289bce0896f90dd7a1eb812c95ac1b810b72cb04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 365/454] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 12b671c9f128c8586810e584e9f10774f2c22d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 366/454] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ded3d5de502071d7926d8c59440faf8cf421e104 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 367/454] c-client: rebuild against OpenSSL

---
 srcpkgs/c-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From b87eb9e3666be8088a6ac65da0fe5de6a231a5cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 368/454] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0f9df6b5b85e6186578de8829ba8009f7155752a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 369/454] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 6a0c11c61a891527bf65b9debdf8c460d1dcd110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 370/454] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 61f7e82870e60938c45443a0f98d27d4886dc171 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 371/454] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 8cf746ebefb62d1f088e2dee3457769b740cf6e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 372/454] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 942f22d43016ea245fd592b4be4c9d73d0208561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 373/454] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From b5553847f3d1264002a8e669e7d1bb19d9f963c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 374/454] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 64d4f5cf3224651ee7f4a3c31e18f764994db877 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 375/454] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 01a7dfed9c09c619b7c20a79975e9871c5ac701d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 376/454] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 6306dcd9c055c93840450e77815b98989a001dff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 377/454] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From ec5449d40c62ae56a935fa3a212c2138c479d170 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 378/454] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 192a7414f268924a9c3c4ae338650dbc48c9de18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 379/454] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 359916def15f5e93ab90d91b4ec259bfebc8170b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 380/454] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 8ce4182b94b8efa8a9b90a92275a90c83b73865f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 381/454] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From a748170ae799d02414baf4be3cf9c6a269896b25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 382/454] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 081145ab79b9c181deafd34572639368277460df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 383/454] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1d8f8ef08bca02db10b14934cbea94d855368f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 384/454] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4c7eda4d7f6ff81886a0464696fccc07c9afd615 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 385/454] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 77c6077f80de5a3a4ef017240e658e25dd192fc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 386/454] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From aeacfe400ec162ecdcbb316e851b365feb0c0d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 387/454] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 007a972e2d8ec7c334608532a89a41f284ecb661 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 388/454] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 53d3af6b405ebe88e28c9d2b0e83c890071ec1ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 389/454] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From b35ec2c88b7a1f43b7726548f0df34bb3bd56c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 390/454] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From caf6b06c7d2448911dc78e6c3ac70f2ac00ad8a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 391/454] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 8d495e15d0184a18fe06ee2747c5298d154bc4b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 392/454] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 95d64a17ee65ac28fddbef0f0660d282c5617fff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 393/454] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From b1df417d421489d326c55769345face725415ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 394/454] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 9507168ce9dd3d11a6ae681846490cb1b5942b6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 395/454] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 4b31499653acdbd797376cbdde5f601643414572 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 396/454] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 3c72b55678be77a493fed95f49d4dca1df99359e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 397/454] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 1bd9adbe6ecf9d8bc537a8b7dd555259702ccbe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 398/454] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 9058f0f2b40ffed36258e81717b4bf6a1fd01154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 399/454] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 6a362ed66593f1a74bf3ca8cefefd540f26732cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 400/454] fixup! Resign as maintainer of all packages except
 xbps.

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 3dadcef2172314cb56c7a3b62cf038b89f418e10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 401/454] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From cdec6441a75620ac97da94f751fed2d7b2d9952a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 402/454] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 96220147e9e35f129f33f530d26406782cdbddc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 403/454] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..75cf9c33500 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config python libatomic-devel zlib-devel which
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From e735c22787ba73e129cc36f803be02bd501ac37e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 404/454] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From c632752a40d891d671c1c3313c72ebe3dc68bda3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 405/454] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 7d4b2400b56f6dc956396e5a751c4f9786902e31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 406/454] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From da0b40fe3a15db99977b4f3630e10b3c716ad652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 407/454] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From ac8c43a2b8274886fb7e2a2ab7dab0b76604d7a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 408/454] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 9c6eb5ffd4221324187ef42264be53ef483cb192 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 409/454] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bf6e1949a3ddf81df8f6e1bde228dce106e51ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 410/454] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 01008fd6852bb12ce5d4992f36cf346f8b2ecea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 411/454] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 301d9cdee411f49f2f938335209e2626e005a5ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 412/454] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 519cef79c39168376560e185c617522ebab16c77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 413/454] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 6b454ea0ca8008547ec1f8142fdfc05c0b6d37c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 414/454] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a40badd614489e454ad7dc6c285919dc70b87c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 415/454] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 8b2ed0c1b6459cb9c57fa17120c1f8a92983fbbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 416/454] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 4a946ae5086f6c16b0fd30ee3163255197560a55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 417/454] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From a9e5f80dd82235a73613d80111482b708e3d36dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 418/454] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From f67a4eedb0afebdaea2dc2c39c6f16b9a82f0592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 419/454] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From b335d8f6bc278fe3384e94fd39b928544a1b27e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:00:19 +0100
Subject: [PATCH 420/454] rkt: rebuild against OpenSSL

---
 srcpkgs/rkt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..0eed248718c 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -8,7 +8,7 @@ configure_args="--enable-tpm=no --enable-sdjournal=no
  --with-stage1-flavors=fly,coreos,host
  --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
 hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
+makedepends="acl-devel zlib-devel openssl-devel"
 depends="virtual?rkt-stage1"
 short_desc="App Container runtime for Linux"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From facc2ff4406ff00c16a74387570054dac74eabd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 421/454] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From ab254330c9b869426896f22e1e276259adb31d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 422/454] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 06feb25b21dfc888864b1833f7cfd9b98275d84b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 423/454] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 273a4ae372a401c69fdebd80b2ab159ceb40d48d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 424/454] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 5e2d47e3028540abdcd553803ac55278db70a9d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 425/454] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From f76717092de8cd03d8b13e065e9876d7532420b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 426/454] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 87588e1baa44df1018260691f23e8cce77abf750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 427/454] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 2002d6bc1288422cb2b6db56ca927606bc3855f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 428/454] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d075b02881f9c3763d76aa6f92e6f7738a2003fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 429/454] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 287f8a3fd4a9e9217a1b4ed27797817083850989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 430/454] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 5f5754e0e194818adbdf7dcf86b5d198f126a932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 431/454] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 95eb73670220cc919295ba882e7c0cdae7d9098f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 432/454] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From ecc558b544c8d13be826a23f220ba13e745aa400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 433/454] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 7f9579ca7bee35bb51c881c427f4d0eed628e993 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 434/454] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1ea2771a1e34f7bd5e0f342c3d59e73dfffa6d9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 435/454] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 2fc49ed5e1b4a0d9a43246e6189f37d809618550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 436/454] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From ae12f6c09a5c65ae0adb570ebfbd14c170d83c1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 437/454] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From f66af413a4f89bce0f8f0ac3d762056941fa4b2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 438/454] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 04463d1110eab68267002d689015266489c9c20f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 439/454] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From b924c8b6679989d786da75785b897306c87195a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 440/454] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 91f97436789bb34c56617aa1ba80e1b83efb14fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 441/454] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From bc8bdc75cb68252adcfbc265f1065b631f9c6cea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 442/454] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 8ad1e5efb821406c2ed9ab536b092b671ecccbb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 443/454] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 5d19eb21b6f012c68f1cd37217ca52bdbacb71f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 444/454] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 5f9ddb01cd4e1a236b4d4e89b7ffd0cb910dbe66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 445/454] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 901bc01c30f52bbf4017168343e2c64423178039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 446/454] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 1767781760405ad194e52e94dc793d2f467a8923 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 447/454] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 367d8ebd9f4fcb7b461d638454c9d1864c9f91d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 448/454] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 42f767928a38654ba833565d8908a78c2eaeea8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 449/454] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7a..87491d9fbba 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 22b4834f6b3457758a24d4fcf91665dc12391056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 450/454] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 45c027970c0ab481a3beabca179f9ff4d2e785eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 451/454] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f..ee751c6216f 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 9a86d3ad31ec8c1956ea899c6c460ee398cee60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 452/454] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From e94192f0ae0494f4dbe2ad2f1db7494be510fdc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 453/454] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From 3535c86c8206bb8e76f5228e1f63681e84e964b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 454/454] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 482381 bytes --]

From 818b8a0b8435b59dc0e6c747d2e29608ee4906ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/453] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 70596feb769..72892eb6b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3505,7 +3505,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 75736d27a6e6ab037462129d105f88ee2b239e44 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/453] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f0..a338e53b1e4 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.5
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From c12237a1fe6d999f72f0b5959e82c30519b1e2c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/453] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From a9e3b12193d6c63946435b5b61353cfd831a9f39 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/453] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 57959706a54..62a4c618cac 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.2
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 9fadf65eb4933ef84d41d60a65af23ca5db314ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/453] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d5210e2df59a51893f99960b350c7ba4e53a5a53 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/453] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 72892eb6b64..c095b3966c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From e63d3b3123a3913cfc99975cbcfdcb6e511a6708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/453] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 8f3c9db5516364776a602378e04170ebb6b4b989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/453] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 583f7acf30799ba9e315f5b57943cb46affc7668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/453] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From bfe48f4149fc7099dc290e9496af076fec19b66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/453] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From 6cbb432e154ef537b85ab8b38f69293df336a4ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/453] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From e0a6c2a9e4b3ec85a7e4cb185e132fa56e7f8834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/453] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 5df674cc67db8ecd7f70fa60c167bd1a129d9cf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/453] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 5064db57d66acb2f5e34becb8154ee1801ef791f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/453] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 2371262d0a61077cb72d9d06f329701b844148bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/453] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From c7b5bcc750dcea9350958e5d3185c265ef5730ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/453] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From bf56073cf25a43b472176db09c9291139dd094b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/453] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From ce4d543881c0f2e2a3d3d657c4600c61825ec766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/453] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 3c0a210539dfcbd22d69a661856ab6412667cfab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/453] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9866f29e7e5c6d895f8ea330e331117f81dd9e21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/453] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 71ad0b6d42fb9b5469fac36bdf9487f39fccf08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/453] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 14e6f10465997505d5d9f9ab0c025224ebfbadfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/453] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f04b7d26c51cc381a55a5471b908d01e28a9db2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/453] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 3a7950370c55302eece5fabd2671764677d08e3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/453] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d7769ce0cf50ca754578125d31f4761f7107b35d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/453] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 02e4349a248309177bdf1c82d9336349dbe18f17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/453] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 84d9cc455f3d5bff389a39d10bbe4017daef5bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/453] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 4e653b6c081941a204c040b733d5c56d17f363d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/453] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 823931baa535f127705a9160ec3937c522e22a1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/453] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 66e24b4cd06884b5e1c2ee5c118d2d462b8457e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/453] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 4443158b5b1e3af619bbe5372bd58d9359f65be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/453] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 91e98cea4f19e48db38aeb035d17f4e7304e74a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/453] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From cddbff0671191a42150987e93aa61eca074fef26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/453] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 3c0518e3457e1bf0b89f2dda8bce1ff77ff934fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/453] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 5c095072fceefba5ee75167a77af3cb2153967c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/453] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 454d066dffb54e8f171d39da324f70268922b035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/453] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From d867523cbc32b4411a99794e114dc599bab68ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/453] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 6b5857150d916dd18bd94c26a0bb02884ebf07f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/453] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 8e30cac03e9d6e5a674efb51e34ccfe92e84de4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/453] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a35869463fe0af1e4dc31c4deb23090d98fcd9ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/453] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 60cbb0d8aac53b02b0e8c2139d641cedf29c8841 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/453] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From eba6db8d2acac7ceba0fe26a3ab564a9b2d35b69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/453] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0ef9e95b62535855618a28981107d5e5942a8a15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/453] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 13e82da38db2420fae47ae86b3f88aad416bacca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/453] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From fb54fdd5a4cdc81309684e8310db4a3bc3231c02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/453] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 014cac16f3610b75c29488611854f09a0a700e37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/453] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From ac0ca1e0575fe47a2f6b369a821755205a533577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/453] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 838947506435ef882e937e9fd54f6fe9afd1ba09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/453] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 7c4dd291fa1c7feaba299d7308ff48e73a9bcc91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/453] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 210618bbde9a48e91e9491ee6a09137dd9113f0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/453] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 9f8cf397b5db96295c26508200db9243c1a1465f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/453] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 85f3323abaaaa39fb5a3d1f2671591327f3f732e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/453] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From eb480d2981584b450d07eba2c24d0236acae23fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/453] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 54d673f90d9e5028299ee55f12f4d24641583d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/453] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From b57ef2dbb71ed6c30c26de06a1b0ed80006b79e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/453] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 9f06c050090fd9d3cd5b64f0ad2963b38469f3db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/453] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 3919e5d133e68226e9b35420db960fdfa1cfdd1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/453] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 46000007fa6ff226ddb678675149cfb28964b4a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/453] dmg2img: rebuild against OpenSSL

---
 srcpkgs/dmg2img/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 9978b134c8573a450d0e777c794e3e5592eb05da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/453] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From c808e3bc283c06dae1523c8f4047db715890fa37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/453] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 78473f48605c46d750a5710b90c9cfea50a8c84c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/453] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 88295bd4dd17061303cefde40f7c3b9ef5dfeec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/453] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 9ecd287abee4e6f4625080ce8c61e152cb3ac57c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/453] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 27e0c3597933a31fd229e013a1290ffaa10efc41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/453] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 652dc3f08f870d242917c1c2e4ade825bc1ffb16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/453] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 844bdce29b002ce9d804ff6b354fceb0e857939b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/453] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From b13bbb401f0d968a07d447d897577481116ef421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/453] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From bd027b9a5c1a00e7ae166b22970a5c3b4d9d9cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/453] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 1f0d52054b1e544e591faf058296d94bef134696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/453] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From b1c667d71bcf7e0cfb40289fe169105511875581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/453] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c3fd93022fd90c34b0592ce5e00215120e1ff54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/453] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From e8e2109c48d71ec5f103d1a72614e92f920a6711 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/453] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 66c20644986f318c934d4fe000c3b5b2b6cd1d81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/453] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From e79852d2a3ad9df78f9621a7f03e357888bd767f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/453] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 59c50e6d7eb156756dfa2af856beb7e73f8976c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/453] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 54204412688c360e021cf113612795cf3cb4092e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/453] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 8f6153deb3a2db69ddd4b970d6fbb74e7717a82d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/453] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 73381d9b2a877458baf8ada7f3c36a97384262c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/453] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 4f9098ceeb78dd7a6a17d8c1fdfa8c28b3ad5a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/453] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From ed359f868b02af1dca1d70b37eb0025eec26e7ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/453] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 1674c9b7d5e146c28e44b033bebdec7329b1ab4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/453] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 0cf0e784a25637f967850e34d9112b8b33d41291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/453] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From ddee9646319cf5eac5b97cfd1f29fb10bcae2e8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/453] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From ce69b2b0f886f451d678ec6c0b19cc31aed8a5a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/453] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 0a39ba58495fcbc875b57edd4af619970057ed4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/453] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 006b445a61b29e49b88d396273bbcd46712437d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/453] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 7a0f32216ed764f6213be2f4a9c1b997e2beed46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/453] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From ced14e617d6ae187bccb699a68ba675fcb46a777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/453] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 46f1231018ea21311de9ba511923a5989bf51ffc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/453] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From cb3953bd65187410c833d12a18dc7f73e9b2d9dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/453] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 493a2043071891a8c052ab4011a5904f6fc1d55d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/453] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 53bac0f612354a60dfaeb28b2098e3cfe2644c9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/453] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From a5fbc8c3203fe85850234f14cfbbf15c4e64df64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/453] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6569108727c6553e8a7f1cea1de9fd5b99fd5551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/453] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From cf23d1a3c40a2b86e33cef699a99a5e24b7b29e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/453] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b2146d8154e3ba5da86563ca1e3e37807e3ac5d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/453] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 6030d0732f2e1e16e3c11a44f9d1d6f4a93f0315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/453] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From db55469e3aab8e0584fba3cf77957805abd6c70d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/453] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 2d023bd4160f9ddd1e5402cc568eb0fe9daba4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/453] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 968fdfd65a54b113f4c819e2aa47f0913dad2fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/453] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1a28f93956f4293ee9ffd982b5482f936f3d70d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/453] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 88f8e76e5574d601787fdc748a490a2819633a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/453] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 7797315dd0232390ba2dca83ea915e02f5fd38b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/453] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 136a49c8badb1ca1d038435dd542f4c46a711ffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/453] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 2d624ccd00afd45c0580a979be982ab8ec0e8df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/453] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 098e6420122b5dab8811d22a60c01e1e17b60787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/453] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 47ccce5c6a4637759ffc01effca559a8d1a90d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/453] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 66f81043bb874426fd53527f29061cd5c24ccb1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/453] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 9781edee063af31087904dd468bb5d62fcbda906 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/453] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 6008e9a1e7993fa75ee4cced37adb0ec717c3279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/453] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 18a7ad23ef0a6a21be8225930640c9796adeb0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/453] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 6e2904941c0575bfb6f7dbe1c2c800694a385535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/453] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From f930ebe791862bb51860019151e48d36f92c2182 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/453] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7eb4a05a4113b9158398de46f80701d416efc885 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/453] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 5f5036e47f0985ab49cf1c12be6b33cfbd5e4794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/453] ipmitool: rebuild against OpenSSL

---
 srcpkgs/ipmitool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From d086a5f63e9c9dc3c771bed036c7fab452d5a8ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/453] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From d90f97dc91db8045483b1e940313b8a27253c79b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/453] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4221711a24937d77e9116c6c804dd042fb0adba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/453] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 82f27f3412e10067853a460aff2144b9ec1803f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/453] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5dd87b2a6443b45f57cb007c6c9ba3a22c35ec79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/453] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From fe04907f460a4a6d7460b84b246d3f6cb28ad59f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/453] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 84074e615d91edaa1a7e8dbeaff5a2f260bd851c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/453] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 38eab8a2d6b3b23557a000a48a28f7f9838c8161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/453] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 59fccc7150980a3695669944410f3837c23b340f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/453] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 6d036910afc1eeb261b8d584a777ae58f26871f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/453] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 1379d06cb49ad1a4c4d1085b4e1147abcdc6f5c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/453] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 38311f5f0ea656417f7b5e26f69209b48b683bd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/453] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 5a345db9f9d8f8510687cfc2649955a335184e5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/453] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c4555e17120856717b6c1affbdd5237f8e213a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/453] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From d267a8e1670236cdb37d7b7e34c61236292c73c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/453] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2c3f79f1372c025cb1b6e26597d38f4ad87190a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/453] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From f4c61c43353c290eeb9c1ffe7baff4f6afd80548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/453] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 0af250089384c3fbcdbefe1041f23e0d6f0f74df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/453] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 4e3afb0cd6b2b23651da4a9d30c1beba749c263c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/453] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From af965c57b99c5efb1342838b0dbafc8ac32c6017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/453] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 01b0a5c610c3ba9cd5e6a275dcbc64feb25d2a8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/453] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 0cabe07687adaca2137824fae55a03909d67063d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/453] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 30c71e5f684da9e2508f0019826e0d0a25078c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/453] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 655c054e4feee3f47443d201b8189b190b73e600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/453] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b1384813bc150240fc42286d8ba625c7c3dda5d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/453] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From bb741d563a2dedd8b6bb339fae2c49832d2123a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/453] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 7bf6d0be8dc611b5f553baa99d20c06e347203ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/453] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 0a18dd88554267ff738aa83d9c107abe4ca51aeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/453] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dd2f1a5afaa04b1ca65ae2ebd6ba1af55b0fc512 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/453] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From b9ee72a567a33d5b2df64eff77025655e97790d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/453] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From dc97be8ebb87b12ce41bcb02fbb21dcdca4a124c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/453] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e952bcd8ffe63e6d47c7cbb46e2c4d13f3ec7b58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/453] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ed7f6623aead2df36e5ed7fb7ee65422567c8bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/453] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 6997cb9bae6da83211d8a1858059d24504d1c6a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/453] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From d5263ee72fdfa01ef17d24a4e9c13c96419c3c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/453] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 8be65d31484914b7fe1ab187c87260967deb3749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/453] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 84d778881269e9e5a11fa6c8623badf1aebb55dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/453] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 22dcefdfed89dd74daf641e031999fd2e546d787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/453] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From ace3f4d51be179334afafa45d80dda894a7337f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/453] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From c79620c7e3b86aa167521e16537619ee5bdce9b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/453] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From c181086ef0ade94b9af0dd6d3a22f1384139337a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/453] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From eb7ff15c681e6644deecfc9d1f0d819992aa0145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/453] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From edd400696e9b67920a87dff7c65357da25ea8f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/453] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 63c1b4cdf0d9bbaec6a0e7ed2f5f5df5fa064486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/453] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From aa84e561b456fcfac8cf6bb8b15d64c761722a77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/453] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 650645f04c7cb4d71e243edf45d510da091cad1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/453] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index e21433f132a..31fa1129a99 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 69706071e3064092171195bfdb15c6dbe9f6e763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/453] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c8e4c6e8bb441a195333c1cbe3b2b0364ec78b3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/453] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 75d8e5d8d53..bd6e2752599 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From bd1f6eff386f4a34848a91f212d935ec1c46cb6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/453] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b772fa393eb868f7b2926bb2b003be1db5bbfc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/453] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From d5191812c01c3bf56aeede8f5abe3df98be755eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/453] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 338c5bbef421e5d6a875fb5febc7642194d8768e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/453] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 84b4ae6cbd485be2d26ec9c4a728dff6959b839f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/453] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 06861ddfc52203091ac19b072fb1df43849fac84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/453] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8c6ebfcb5b95dd24dc284046740e50011452ad29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/453] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 87a120d71332d3e93d0495d2b5062dae7610da42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/453] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From ea73ce883dab04454dfb98f50565cc2505e850b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/453] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 7334c801a30d830c4d264a3df1eb5da6f8440848 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/453] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 4c060a3a2f82858c5e68582825159625271993ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/453] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 79af8f3d499f5fd7a7591204d7de99b5475afa23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/453] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 279da9ca702602d0d474a76af80c8ba37db03a16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/453] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 5dde6e7122e4715972e7de49597c418f40109bbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/453] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 771e877950e2a4f895523528524a4f1006fe28b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/453] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From a73f534808a8d17f734c065549f9611156f263ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/453] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 5d3ec20f277ffccc84a228a4f598943412ff375a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/453] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 1cdfb1fc96877bca66ea171b5427fd8cbb45b1a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/453] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 1ab55cdc347b42de16e02bee3860ac33edbe6cd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/453] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 7da50fb353ca676239a2b1a9e28971553c44c275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/453] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 8bba167697521d6243531f2176d023edc0edd330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/453] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 2f1a648862dbe791b071a06250da1cb005b2e0b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/453] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 60af8a9a9f4269660d2c5989f97300d68ad73f84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/453] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 49b2c04eada546b20a15942fd11f2be3276df603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/453] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From d6edda699e2e2eabe01b8f192ff5bc109a67f8e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/453] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 88447c2d0dced260247e3aebc04adff2566468f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/453] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 23d647caf668024b62be16ca4d728b1ef122c079 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/453] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 242e96632288a9ef13dfe43a778b91e96318a97e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/453] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From bff357ae8858743fb6d8ecf5e9865f3e721dfaf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/453] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From afe06e23414f308732d296eb688b0a3a2e181742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/453] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 6991acb605efe131739220bcc9212cbdb10159b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/453] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 4653c86d2097d6b3f1adb760484bd867a340316e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/453] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 55d33c61097311290362b83377507a749c88d6f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/453] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 5d3cf6648bd38fde22bdd82092a9bd73261c756d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/453] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 6594a6c6c8da89726275c77edb42330b754164dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/453] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From c0be04044637f7295599e230c5fde02c71e40012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/453] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 52dcb06e0d1031f53fb12d349c96ab2161eb2510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/453] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From f56a9d7f21f55f1fa01b28495314ebfaaf598c96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/453] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From c89892c6c88aefb6e58399056bb41626584f38d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/453] netpgp: rebuild against OpenSSL

---
 srcpkgs/netpgp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..3ef9867c3a8 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"

From b0e2b0ae78c6530967e0af1d3f5bd0c9ecb1ba7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/453] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From f69e86203ce84323cbf6975f3098aae380fa6d95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/453] network-ups-tools: rebuild against OpenSSL

---
 srcpkgs/network-ups-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From cda996332a38767b9f7375af0ba5e862b96533fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/453] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 99dabc347d0b07dfaab8d8e39a1357f924b4c9a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/453] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 5de9352c59d7b928990df21942955fb8c504e443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/453] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d..786d3992ce7 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,9 +2,9 @@
 pkgname=nginx
 reverts="1.17.7_1"
 version=1.18.0
-revision=2
+revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d4e8428d59253069ae098e48307edd340474e6e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/453] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 75bb08a3e4af9d695c90bac6c498a4144231dd84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/453] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From c64729103ed2eb302ad192d8c7cad1ab1b196da3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/453] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From b6734dad2e07d11d3e533f701ad2b3de1d16af21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/453] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From efab269a0b9de9342120343009ff573abce3aa65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/453] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From f08dc916d3a45117634586a228908441dc6a28bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/453] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 670c1f59730e766359313feec3aad91894cfe6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/453] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.21.0
-revision=1
+revision=2
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
 # remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
 wrksrc="nu-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 4a894763fabe774b7524ed46b8addf2b511c8ad9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/453] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 31ec87e48b41d095396b9cefad4eea22c0f034c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/453] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 04a1bcb1b2c94b0b615761376b8c0c043d49bf77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/453] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From addd39862798743246fe1d02f900652e0baa66b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/453] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From aa4f9b10d3c17bf50a012b0e06f82f8cb5d0e77a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/453] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6f..5a50ab3f5c2 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From eea57a919fa22fd0ac21e9ed1bc4af23adb6288c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/453] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbc..5b47c649eaf 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.52
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 1c20177c8d2974ab3c4f971beb3e81201388a697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/453] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 45e5fc7fa8a8dbb0d120a419572fe089f5e7680d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/453] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..b582821ccee 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -19,7 +19,7 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 8ac58cb977be2ea0c4d47228ca15d38295bf9db4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/453] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 1833e5df88936b7889bd130bc71297a059f384cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/453] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From ad62913834c7978708a4cfe467e48215054e710c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/453] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 0c3bbc6909688bf50299cd9e450053161545d623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/453] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..dc1552b8fb8 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"

From 8ec1f7faca94a44f36561f5d0fca3daf8023af2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/453] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b9e034d183bf44e8d4b3530425e376bcffad57cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/453] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 1a09a7c6578a7029c713b36a30748f93f0af53a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/453] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 4f7dc330ccdeda51df500332c8651bb915ec85de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/453] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 3e3332f72a2f30b4e3ec5af43890468187573c10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/453] pam_ssh_agent_auth: rebuild against OpenSSL

---
 srcpkgs/pam_ssh_agent_auth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..a4e09ed9584 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,10 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From bc6f7eeceb32dacaf7f4e918d8ab91033e319f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/453] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 28fa31e04f85390ff906f7f464d66b6c16d37bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/453] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8a69c0b0e774f6ae1e15eee314239fca753c845b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/453] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f3c33d8c77d6ff3e900e2ab3d310a6d0e34e2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/453] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 7d594b5a436c77460b056e7e5f5d0692b30498dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/453] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From b18a65c9e49bcd6dc457b8cd8f4e906508e53ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/453] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 874f7375c92bb0443b507100e0b7750011244b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/453] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 0c7e007f5300765dbbc71fe9c461cbdb69938544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/453] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From df324c727868d6970b19997488d71b7661f4ada7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/453] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 823fbde7cdff462059b0b5efcc1b5ca1e560fc67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/453] pgadmin3: rebuild against OpenSSL

---
 srcpkgs/pgadmin3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..7c63e3bc5e3 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,10 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel openssl-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"

From 333db67a1f482391e6ec8a7daa86e09e89acb159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/453] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From cd86af62e30e22b95425f84aaf24f19a783e7adb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/453] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 2342c6cc8bd6ebeaef0945c4b2275a150340b3d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/453] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 777c56aea2aa74eba39a580c61d3484fa50f6b37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/453] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From b878cdd7495455c5bd65ea36136be78136645d5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/453] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 921db1a3c012255c498780c788bfac8926da5cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/453] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 881a6ba81616331c12fe569c8de3405c0629542c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/453] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 9d403ad872c8bd91f72c5faf7ae217213ec9ee7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/453] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 821fe35485c73b4527954d119501143050c07e58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/453] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 9ec0df61f674329c100968617e6d01c069af78ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/453] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c8e0442e614c0a43f160bef8a18d90c1572178c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/453] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 2c5c731e57285a4eb41a404610377fb33adcc17f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/453] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 68057d16ef0948162e435e0d7c401a95e6c3aae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/453] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 707dfa9828e2a886fee9917827904f8a64c738f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/453] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From f806364ca111d0efdc17daee46102be1ceb04159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/453] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d809264c74d6d1488d33f1fa00f4082439f328a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/453] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From e51b32d263afedc936ed18e1a32f4ebd22c40dc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/453] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 147c44c690354904ef601fbe5d654b7f13e96658 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/453] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From fedde801d6a6b6b159537a48d15d313be5e1385e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/453] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 3905c4a1b646c5fa4600dfcb60824057de73adb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/453] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 97e93d9bd9587de81f2e3ec3b9110c8acf90c1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/453] qingy: rebuild against OpenSSL

---
 srcpkgs/qingy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
  $(vopt_enable pam) $(vopt_enable x11 x-support)"

From 5f8b4398887400f9634323791625177610f21679 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/453] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From dd3fd5a45fa8f56c8c501b61877dd88e59eeb2ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/453] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From f38197004954786e9985acc2c24a7ecaaad14162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/453] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 2b3e6f5e5b32d22eebc31c45f435df22d50723ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/453] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 6de561e4f52c57fbc85d1d55ff08eafec8f6cb5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/453] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 6d25c3cf728f93b00903f8eb8d0271bd128a9641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/453] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From df2ac0532c63d490bccf3738dbef641646a8ce7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/453] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From aeef28e3d5abbf07990699040d08f7deb739dda7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/453] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 0931642e70500290d1cb4bf70f43c8895c2312b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/453] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From ea9fd9bf84329746c4fab07d1f4622196226a52d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/453] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 82c7790029bde9e4a29020690024fe4b049b8853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/453] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From a5fab03e77ecc530aa96406c584c9d1b2134dec9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/453] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 237ab60e1f7d35135b270b3211b3819090b1a2b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/453] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From d151b36f2d407b469ae1614c76be2980bc809914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/453] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 2582b910cb34db2fbcf120580b6f680d1931ecac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/453] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 2ce2be39d840effb4c2f2e562ddfa02e9ade0c04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/453] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 5a20e1a7836ac42dc020d668faca38e5a084b1c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/453] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 212d0acbdd2d4a1719ce037ed004e17c03c36567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/453] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 3b4265dd9187a95913df6ac77fd4a8094f3673b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/453] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 101738c26e4566bd6a83284b255f13627cf0fa8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/453] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From b42231142a8e122f859e9bbfbd57dfb32ee89ce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/453] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 181b8c7e7c34509536b2313da8ba31b17419658b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/453] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From bb1c16935b52255af1e4daa81f9fdda57f0a24bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/453] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 34446a0c3c41aad156f63cd2de779990c4101ded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/453] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From db0e024730d795cb742d785686468b422468f9bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/453] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 3e24941ebaab05f6e174b54af642e28fbf356ee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/453] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 94fa92451960cf25e343ac92277f63bca3eec8a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/453] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 96765d9534537962001d27621059223d448fb8e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/453] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From c9ce77339485c7deffbdc804e8b46bd69b862a61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/453] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From a26a7c315d89738841dc2395af457a848393480c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/453] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 55a268e908a00cc8b77fa24303d7ef01265f8abc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/453] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From ccbfb6ed727ba24ac3bd64b986c43db9d0332989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/453] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 34dd1af41b2a26f281f5a655adf64d14f0ac28ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/453] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 80db78342968940ded2db9999d494ae0b160c00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/453] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 481302d04b67e059506b4d72889edba6d8a728a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/453] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 76eb0dfc81dac4a4e54c1163e281de0614aabe68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/453] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 1392805097961b4f1a3e33a0d04c79e7b882599c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/453] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 98d8b3c2c19a3c7bdc286118cf4e7c8fb8ed61ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/453] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 5f92aeb50cecffee0b770e58771451f591feaa70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/453] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From f03b7235ca1e47aaf83ace530ba9851d03a4c93c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/453] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c85f0b993c5c82e276f207919f4805b83bd8d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/453] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9337239e74a42d4612fff4d5c4507f5eaa3cef22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/453] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From b636f28b2f5702864d157f322527cb3639360ebe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/453] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 004c599c90e9fb98c1bcbf892b2544d5c3f80d95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/453] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From d7df9982a066c4e0de7768f36db87dbe29cfa71b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/453] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From 98b4c3d9cbfbd3e4fc1b01c083202304da7810be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/453] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 10bca4eaa674ecc74167329964a625fc9a35394f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/453] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From a4744798305cd463a5e6b99f0a45907623729fe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/453] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 90ed4e5a6c4c531e5b2bf82ee3d1e7c613d0cc43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/453] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d61e6cfc1e6e0abd3d68082c6b14f0f53b1c749b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/453] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 21297f4e61ea19d9eefebe9cc30975f1ef97ca29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/453] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 7b9b23ae00b78b45a012892226b520504094cf65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/453] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From b0bb8e03a980478de20fa2c15282e95e76cc420c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/453] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 521bd1e80c61c744fd11000fffff27c7e3110922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/453] telepathy-salut: rebuild against OpenSSL

---
 srcpkgs/telepathy-salut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..367ae2b7803 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-tests --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ openssl-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 61fc52b56d77685148e1b45a1c4b4020901556ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/453] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 16a52856c84257b048015708fc69dfa94f26b281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/453] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f6ce9d96905f152a647cf23628547495e722245e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/453] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From bf379d84f81dcd392ded5d82302624ab184141b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/453] tlsdate: rebuild against OpenSSL

---
 srcpkgs/tlsdate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index ccdbef1a5d7..aa3b54b4c6b 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,14 +1,14 @@
 # Template file for 'tlsdate'
 pkgname=tlsdate
 version=0.0.13
-revision=15
+revision=16
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
 conf_files="/etc/tlsdate/tlsdated.conf"
 make_dirs="/var/cache/tlsdated 0755 root root"
 hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
+makedepends="openssl-devel dbus-devel libevent-devel"
 depends="ca-certificates"
 short_desc="Secure parasitic rdate replacement using HTTPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 07842850b587c559f441da37b72839b3483f86df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 321/453] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 815debe6370a14dd909196deea3439a007e3c195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/453] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 3ec26d9348e398bb01052b22b6ba39748944641c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/453] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From ebd3066022b3d58e202b1acd4949bd2d4cc6dd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/453] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 012966261a6f0cce7f96c6cd7283a9933bae5a8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 325/453] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 51c8de34405beb1c33065bc99efa4f624f228643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/453] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From c2cc3f40ccb1f797e655687ff0b371814af407fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/453] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From d33929eee332dc05cbe6a760bad0e93d1fbd9fe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/453] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 32e7696b17d9df54540266b9afca2a591d69d66d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/453] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 69e7f6427020ff0c496d0d2f31aafcd7b74c9c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 330/453] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 746a4c2189992a0c571e7abcc6da38999459dd7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/453] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8ddac3a4430845fef5aa2d03348ea6f1accfc3aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/453] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 044d6668b38ffb62245c9d7185000c9053e620bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/453] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 43f032cfe00c40856f74e9e9830aaa8bbc6713af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 334/453] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 5bb6f9c4bde..11a8b09b47f 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,10 +1,10 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=0.22
-revision=3
+revision=4
 _commit=9e04497a127aa6413463ccf4a4aee75f0d581d92
 wrksrc="vanitygen-${_commit}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 2a27352157d19c03ef508573292de002ba9ae94e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/453] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a9f6518c9a7b3067ba457013efc77caa81b5bb6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/453] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 4907d0de9838163b3a634dc303aa8ac532292b1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 337/453] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 5c27521fec7d83521142afbd6c783a0dd30a9da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/453] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 9e67360670eed2b65d4541a2f041c91017db2363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/453] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 7c005f4318dd4e3d82647b6a9996cf67fdcb0348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/453] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b88392e00c7f07175fcfa80f40645705e24ea648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/453] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 4024b1dc325e7bb238608ae07c23c82bd0b1d58c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 342/453] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 1eb33ab22681eee7ce13c570744d56c16213599e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/453] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 2bc4629a2a874c338af8c8d579dba239ee6f581a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/453] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 48349fd82f8ddfb37a7c974d23205120087970e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/453] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 44f90e4e125db1fc5b20dedcb930a987f8b66aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 346/453] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From a588f2c4156555f66f7256a3b93b530d4e3a969c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/453] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From b89e9ef8038a914050a23ff78c7642885bda8775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/453] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 3d54137571ea207bb22a05e76e0391aeb99a7c90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/453] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 619f4d3fbac6ddccaa0395e65c63cfa2e5625856 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/453] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 269ddec25999544aac4981f0ddb940be1787bc88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 351/453] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 2083247f591d05713daf8bb68241464d5745ddd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/453] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 6643c7c558aeade7977ce2988da667f329cddb0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/453] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From d13de56f7c1dff33225254e1b019e77098c587f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/453] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 35270722a91120cffcd54d5648321b67fd9295d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 355/453] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From a3bfbf73633abb3f05dba6c933434766dd33194e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/453] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 682015139f745b15bc4e846ae93e833024c0c345 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/453] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ca0a5115fab88d6495c41a20c537be89d617ce8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/453] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 70ff53dcd698f58d98f85f1ebe73d496cf5fcd53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 359/453] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 0b310de0acfb9677a5f77be71c4735d062ccb8bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 360/453] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b4135b5c112c09fc15f5bd6728b18e550db90efb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 361/453] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From df60d09c656b562e064ef0dba3863e7dfa6d93c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 362/453] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 26634b872d4bdda3cc09c27d4225cb6d6c9f03cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 363/453] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From ed23234a811e9bdf0b78ce47838a57249efc94da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 364/453] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From b53ff66b595e8def20443c0bdaa16c6bdaa97eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 365/453] c-client: rebuild against OpenSSL

---
 srcpkgs/c-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 93728309d1756f853965ec08799ea9701d021573 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 366/453] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 5e04410d098dbcb717707877aa1960b770d713e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/453] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 6a9de4583359e7eec9706f96c11069fa7302f66a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 368/453] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From e4071e5b6030473e54a4f55f72586af331d42ec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 369/453] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 21f865b1ae10c93d552d01b2bfa4beb678a1b0e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 370/453] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 53452d421c1dd69dfdcd310ecc799f4fa4cef781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 371/453] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From e85210059aebe8ffc4508bf4fd9ee19563f7b233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 372/453] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 59bdfff8e66c5ce32a047b468f805cdc9dc28384 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/453] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 6a18d39f56f7c2399b7280f91fe60303dd41cacf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 374/453] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 3cccb9e040cf20314d1c403f5d77bc43816ee980 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/453] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 6d1b2c60847ea4415d332ebc9491fb4e8eb4fe3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 376/453] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f4fd67e9e52d807991dd904efe1a48070c035dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 377/453] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 2eaccdefee83269a3ceedd598867f1feba2240b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 378/453] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From c6ecb7b31d56b2143c1a2d6b54ca5a714255c906 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 379/453] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 02f2bec5bab6fa2775f9688d7df2fbc1216b65c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 380/453] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From a9afc624ff974dde8bfca31768bf7b14d16db6d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/453] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From df793fc6169d66a0f997c185dfe24477fbecaf73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 382/453] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 337a5010353a725b9ce89a00e9702e55cc565ddc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 383/453] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From f452bc38613efb15831dea80424c8b53703624cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 384/453] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 9e5e5b2743bcce50c5f6965f736884faa7e66b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 385/453] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 06fe295e566c16bff8834eef7801a973ca97791e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 386/453] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 550f738870f6464d97f2edc577f3b32ccade15d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 387/453] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 0f6030365dc6f08581575fbd635833e9bd8ff4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 388/453] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 1554ad6c55c9f85b350d0f27ee4e2c86856b9595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 389/453] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 1a2bcea371d1fc27ca0305c77088944eef949485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 390/453] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 16311e8d0b64285a8399f16c04e068c02d1c5c44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 391/453] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 3df32aba2829a6237a54513a9c07b11cc1d1c1d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 392/453] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 96084c2cec8d7b429f53e6d285b1d8a4eb47517d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 393/453] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 14c8ce86b65a320d736933d30cc7aeb5e554bf4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 394/453] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From abadf61501730fa381fca1645e11703cfaa89b40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 395/453] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 2599cc1263272a8bf107328639c14a7ea8c2ae1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 396/453] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From f11c66cfc2c835cd51d6632cd8aa1099f023cc39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 397/453] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 05c2d2a6c17e5876247ecfca78d89eab2ae2feba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 398/453] fixup! Resign as maintainer of all packages except
 xbps.

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d73e971013b0d003df15e5c54ebb41a4ab5df7b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 399/453] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 470737e6c4d16ef00b30a4b815aba8cf0898ee16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 400/453] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From f4bec240bd8e9005f3823f72e0a8a1d1038a386c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 401/453] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..75cf9c33500 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config python libatomic-devel zlib-devel which
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From b03de67edc928e3e7c2d7815b3eb289e6875bd2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 402/453] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 984e6bd21f528c9500a7d4e6527269f59f8bad6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 403/453] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From fee2f430dc3497da9229afc1a9d584bcec7b10c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 404/453] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 3426b1b47d80ba383627c074e2433ff6f465e849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 405/453] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From c91914c6f1dcf0af30c127b604b5fc3d4c5a93ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 406/453] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 9a21a55703c871726034afec66ed11ead5d3065d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 407/453] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 769c70cc1a2941670d8fcbabb3f730ceaa6d4ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 408/453] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From fbb7e55cb3cbdf1ac120c3735890c17846632d20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 409/453] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d53751bc52a80e7c4c170c317cc89d231a5f6f43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 410/453] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 08292ec8cef74e69914ac8776b805e4eb5713da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 411/453] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 2a02911c6555eb28cfbfc879da8ab9cdb44922e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 412/453] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 595e027675ff6060dd823d25bfb60595e38938b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 413/453] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 356a7de7fced7139298750a0a8bcdc4e76ddb39e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 414/453] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From a577fd80d7deadb56c2b532e3cd572311afb9fbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 415/453] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b2ed15e1e6a0ef59184c3a19a58729e1e5e36ea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 416/453] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From bd55979f3de3e89332ebb33dda08e23d7adda6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 417/453] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From f40acabba21a5b052330166229fc88ec364f554f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:00:19 +0100
Subject: [PATCH 418/453] rkt: rebuild against OpenSSL

---
 srcpkgs/rkt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..0eed248718c 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -8,7 +8,7 @@ configure_args="--enable-tpm=no --enable-sdjournal=no
  --with-stage1-flavors=fly,coreos,host
  --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
 hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
+makedepends="acl-devel zlib-devel openssl-devel"
 depends="virtual?rkt-stage1"
 short_desc="App Container runtime for Linux"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From 9a1c72ed2ded03e12c8ca890d7f3143e92af6ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 419/453] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From a08d596171a298820e5e68502e980b9bba14ce65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 420/453] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e6e56647732d67540b2ce21a615a1a34d319de04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 421/453] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From e0a8dff41aa4689de0ab66b158dfedf01b50bf17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 422/453] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From ca2a98dcc2621787e137c012ca956db3696ff1c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 423/453] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 5f8e23b2988a7263a03c109767b20bee69ed6fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 424/453] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From a3dfb39bbfad8db37d339f53227f34b3fe7fd896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 425/453] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 495393fb5b217e2dccb57952f747290c5f9d9fbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 426/453] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 98d2a974e3a61a9686febf751c69edd9919f9ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 427/453] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From fbfded8688f7aaa1f4ba8dcd4e3550bfc211ae22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 428/453] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From d23d58e4d4c5e84b4714d5a353e1c0f9f480ce0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 429/453] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From ccb3ab525aa8a4a50e9bdb4269b410309071d24c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 430/453] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b653194f1077488f465d77cfeb1af911288ad31c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 431/453] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 91cc2bc79d4c090fa78ddd9fb6ef17fb20c5562d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 432/453] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f87485951a0a2f4ba0148648e8458b2ce9de92f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 433/453] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From a7925d371a71a356f2c6bc6a49191787ab2ebd66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 434/453] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 101db70b41550e44f9b733bb077d02dcd359d984 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 435/453] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 116d922ca8a007828edd074643302cd4c0bd095e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 436/453] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From c9a6842c2f750263c2ba47c4b30685c4bfd7dfd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 437/453] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 873058664c950577a391e0bb90cd212090142f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 438/453] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From f5324a23efaf2c551ea422152cf50a250cd9b51d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 439/453] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From 3937ce4c828413858db260eb274ee99448a2d5f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 440/453] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From c1fdc1bd50b42add1182229286b9f4b6aeb07754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 441/453] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 063dac9da8f096f8b344385d55dfb7b7d0970db9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 442/453] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 1df875be6178551c6b96f23fcb592f070acfa898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 443/453] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2d059e1bc111feab397ccee3a507c4493d705d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 444/453] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 3545116eb915ab4ebe82531bf4494cb6aeca8259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 445/453] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From ead043862f681cd3958253b0ee688c7d31ada0b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 446/453] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From e8d0990fb1065a5f2a8f7ba58af13b5320bb5a18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 447/453] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7a..87491d9fbba 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 9dc24e1095002bb6c0876b9d6ed2d8f89991e366 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 448/453] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From a7b74e14748eabc96583f1187e2e624c803d030c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 449/453] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f..ee751c6216f 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 2ab3dbbb2d7ea767db0fe140a13fb9348e330ba8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 450/453] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From b1920a56267c828ca263097e3b0cc53226e2e78c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 451/453] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From b4ec0066fc5a711b0331890f4a15e907df2800f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 452/453] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From fab08c2508abe5c9465f681fe1deefb991373176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 453/453] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  3 ++-
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1c869a6950f..a344abc2901 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=24
+revision=25
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -212,6 +212,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 549650 bytes --]

From 04b4124e5f5f093f42cd2616b2dedb9d95d849ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/453] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 70596feb769..72892eb6b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3505,7 +3505,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 37681c2a9b09943cbbad4b6f4cc3127557540b1a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/453] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f0..a338e53b1e4 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.5
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 60ab6ce5a03e5c48fd2d214f957c3e43429b85d0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/453] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From c0cf316d29f9aba1e1b517681247cb0e12c7094a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/453] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 259ce7ade71ca71ed39d222a0ac14b2cefc48cd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/453] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f612ff3f85fb0667aff573be539d1de414716c68 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/453] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 72892eb6b64..c095b3966c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 21a63118f5fe5ef3706f7adea6674b1bd43bdf35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/453] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 73867766d624da944632208f30b2dd4b4d5c5e97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/453] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 6e59e7cba4ac5d21daa3637c7e4192a6de063855 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/453] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 97c57a6efaf210ac3689fb7dd05c9cad9cbbbc05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/453] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From 38332716f70b2666438bed58f084244e35011af4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/453] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 6e86882660e62a0a7d90dc3b82a4993fd87963b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/453] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 9fc5a5fe5a326030e4804135b56fdccb2e5af63f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/453] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From a22e8e754b9762bc033ba0c7fa8e973cb7992d94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/453] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 3ec41f59a9d7da2446a8dec823851277904f914e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/453] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 92a6d3288507dba6fcee104460a360528b147a2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/453] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 18441610c7496c28c87b2428924ae793ccdc3608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/453] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From d36abfcbc2851e5c8cefa61a240438a147c3c806 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/453] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 8d9cbbd8cec7c27832b282af0878a64e499c9518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/453] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1bb1e6c1a217ce5f9d5b317207aada39cb791d74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/453] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 94bb979e47d02707eb3c360fddef641992b2caf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/453] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From d454e668cb572ff483a9d7b3f59bb3b83638bfad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/453] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From be8691db21f3852433adfaa8355c0cf2b80c3360 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/453] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From f782ce7233372a00d758cd428d257515ceef84e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/453] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b8dabfbc6954420f5e9b82802a38a2ce7ad98459 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/453] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 510e05e531b17a07c35082d2663c301801354fa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/453] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From e954cf50c2f8d432a881aa1831a7dd854e5b6267 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/453] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From a9d9319aafcfdad351a77ea732a2703b173eeba8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/453] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 1c8f86f64ed3db1a5b9512ab8da4949a238b7781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/453] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From adb231c1fc556e013a7bd5207bdbf437653a68d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/453] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From fa3196b38704bb2b2b588e69f8abeb44d17012d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/453] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From d361e7df34fe7fffd0f4d4d72f15749cebf9005f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/453] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 53bf33b5892f3188bec7b016ed0ec44ecba8d916 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/453] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 2f0b41647a0393a25764537bbff08832b27495de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/453] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From d29eaaeca4f1019d9ec00080d2c73430e31417c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/453] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 8f23501066932ad57490c53ab7cced0fe751230e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/453] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From ee991bddec8d42ea84e6f7d88612cee54c3f3d68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/453] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 6dd514048e7198c638c7c6724b51595d919f73be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/453] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 0e93d8b3fe5e57e3400e1bc74f866018e39f10e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/453] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 39179e1cdaa60d91d61a57932842ac2d45cb2ec7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/453] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From f154f5b469d1620952582583f510047d1b65e869 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/453] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From e39afd7d9d851cca9c3eb6908085f69a11ca41cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/453] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a3bc499d66b4619f0e458316e5042a6cfa8b9e6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/453] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 71e7d88b167996717166491de79e5497eb4e8a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/453] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From e362614790d6b4f74616b33b5fe2b1bb0e73e411 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/453] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 98ca9b81cf5f070f73fe8580310df4c6a99395b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/453] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 531bb83c5df7e679dd1182ffa508c5c98f7ab18a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/453] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From c2a25ae2f1373a42ed976a3c70669a1e28603200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/453] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From a6fd0111ccf35ab4f91d81556447bec5d363d180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/453] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From de8274c6cc0fdc4156a45d83fa04928c4de4c388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/453] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From c15a0bb6f9a670894a1382b1e924059e461d482f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/453] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 93290193a8a7dc3df7223fec53d041f96a15bc40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/453] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 77decf0ee9ddc94fae2a59a10a0aae02b2e639ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/453] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From f619ec6a68352720eda7339b4cc39e587b3b33b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/453] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 3394096ab196deaa04deee48f11d120c6a51f6cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/453] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 4ccb889e569579839445c0a0e65afdd0ce99c36e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/453] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 7a4a3be9d9ca7201b175ff561b879e91f1170080 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/453] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From d28d9d154f202a6e004df923718812eb21ced54a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/453] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From fde0929a91d56007fa3a5e9fcbe3a96c7e04489a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/453] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 838695d3d06c7bbb3d447fd17b738f22f1210fdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/453] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 5a5a12723e7e475a2628494695740f79265f5335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/453] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From d0bf2ce1f17f2fe41212546374a041e73f678f4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/453] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 180fc7e8f293a7b5e48e3b63e3e8773f732d9430 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/453] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From e702ca4fe9a34045cf4bb9f4d7e018631704fca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/453] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2d484905cdfd280e4be956bfbdf3072155664685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/453] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 23cce7afca69f9734197986fb4ea51bf05ba393f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/453] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 4a530344ae51cd1aa9f02dcdb9bf66e478ca0e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/453] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From fffe4705cae49a0340eec6f90ebec1f4df419e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/453] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 87fb12c70b4138a1a510605720cc6f8e148c6499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/453] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From b477aeee0f603050c64243d59fa5419197f8585a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/453] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ea005cc48d7bd2907888944a41ca985b68bceec2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/453] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 79352a07943e54bf715ae3b7741f42460b727690 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/453] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 46725c7c70c4544f4e31375258902965c1d537c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/453] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 29ec02415e7033e51aeffed3284722ba7a53e3eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/453] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From d441976d6765cafa25d1b1fada775d8230c8a72e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/453] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 112aee3bef6f83f6e202a888c6ccbf352746d5d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/453] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 573805d65d3edd452c83bb7f086b32f12035f4d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/453] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 94c133e01d6c43c8c06f9304f69e347e653950bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/453] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 9d4458f657a1cedf4f12b969a1edfdc25f8e43c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/453] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 019e5b73d1d55498961224403583fa087824a3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/453] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From d05b0ba6a7a5bdc710e648d64f7d27d4fbe4fd89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/453] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 4e8f24555546a60cdeb849d27c05a9c9412ec8ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/453] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 9b2e04e373b421d8d4552714ad826110b065e4b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/453] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From f81c57274aa721562aad28a2f75c6f234d2765fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/453] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From a27e57992a8c93cd1cb94e0d61ba11b3d752f382 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/453] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 50ab355ba36ca931989bc1cb20618eb33d619dc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/453] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From e716bab995128dde10fb426cdb514804bc4f303d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/453] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From c8f5388f347670a80fd1de65c98dfba9413d5d8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/453] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From e73402ab0ba1f60c92edd69e89a086c168865710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/453] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 45349b29ce0c1d2858a9fc261475f1a929c6c36a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/453] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From f7a1c62bc0de5e73995356a42d5d4c8b1831272e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/453] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 49d9f4671304d3d314a5a81bbdcce298c6d3585b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/453] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 13c7d98a070d59455f3b377910cc7987ae854e26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/453] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 0ffb7f79beb591533ae4c111c7b5b32a9fbec791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/453] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From deab6cacc420bac22b71e08f6d3e5038dd45cb34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/453] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From cf12d4d03c9caa9cb7cfbbe82494f990e8b9f252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/453] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 4623b4f77ffffd7d1b815d26623320dd103639ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/453] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From c6bbb823672e0268557f58668f0f35ebda633e09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/453] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 0975c88c82138a581f20056eac830f8204b66548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/453] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From c0a705651392f85d61fccde4fbb5cdf79dba9b4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/453] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fc76a5a7a470a067ba457a9bb20ca0b0dac42711 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/453] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 9ec50bd3cef2e620579baa2b2634584de709cca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/453] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 5f2813160cdcffe735c917741a60a649e97472ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/453] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From b4baa1f817b9b241f509c0034ac1f772649ead65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/453] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From f4714cc10beb61d215094e1cfad2ef83b1ef3487 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/453] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 060ef90fa7d8e073d266ee54e5bd8a8d3954d310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/453] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 3bfc4e5a118b1cb3db1703b3800bf33cc5952cd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/453] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From a3b58ea3e872efac641981f8fbd669e6c71d5c50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/453] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From c573721c6f091abfd8ce31a1e8bda24e4a32c4bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/453] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 8be3f8e99dfe297cfdc5f00f1b1eb488454b486b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/453] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e1c509f01c4a85ab21c90d48fdead877ef94a68c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/453] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 405760e2c2cea54b0ff4e599d1b7635acd703840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/453] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From e93f6bc8566d7da9bdea0e253be80f5a4f37c838 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/453] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From bea6d82330e4bd2c89c330b14feed0e79ab7bf66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/453] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 4ef9a86fc2460746f82ea5e5d8e78ccba4433b24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/453] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From e280febc41a21dd8559934e8cc18a82766418de9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/453] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 6dd5e83cd8bafa5216b7ac4fcd4ff9e84226d826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/453] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 00452ca1c0cc147dbfad8fd744c567fe055541bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/453] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From e48202192f49506221728569e8c00c368b5667ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/453] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b2f814fa0dc51b0b7f4aeb713667b4dc1e68d7f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/453] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 5cdd0f6907e59d0ecd5e15093c3953427f3ae48a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/453] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 5b4d79ace9e3c34b9cc9874286f5686e1e90dfa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/453] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 783abb7713aa95eb44651614afd46f42016b32d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/453] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 8b6cd7edf1263408e13b6e70c9b7ee96ef500ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/453] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From f9cbb8a8247892cc9f70c4a8c576b5039f0b9862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/453] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 76a8cd157a57fe9cc8eafa939c2f285e4a673bc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/453] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 96a54ac75e0d8bfaa97a80cc5826d821172edc1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/453] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From b7204b8f656d98b3ff766a6a9143ee95ef507fed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/453] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d28dd2e82ddd4a3d600f127151df6bc8b2e4e89e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/453] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 02579375a45302a28a1db296de11da3d7039f75c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/453] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 151dad91c850ab92d959933c1cbb28fffd679bf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/453] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From f21978b8dc43b4079a1a27e5eed11d24f7e1ef04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/453] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 1e5c91d37a601048f4a8e9d3b81ba2248949979a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/453] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 45acb2d0d63ebd01e1b330d345f5e7aa13886ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/453] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 207525f8bca5d86e95536e38d22b7a9e5c9646d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/453] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 198af950b66c5700d4b1eca02d32c2a2b663bb82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/453] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From c30a131761cff7377ae177b3379dd14c828f0aba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/453] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From dc720e5f73ebdfa35d13d6950cedcc1c836f1ace Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/453] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 7de37f662c6ddeea25c7c0507e6b3d1a6987db9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/453] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 54e55461748775c8d1071ba89733b9bf6ad65ff7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/453] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 9c7a3a55b519ba82f14071b917f8f628d92ded92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/453] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 5b0a9b384d85176c708b6d02659906fe3d5482f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/453] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 59865346bd15ac873d32aeb44d2fdb2c91df9112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/453] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 48ca55b8feeb55aea52b9fbe0a1bed50b663fdd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/453] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 362e4ac00e60f9568671e594f711cbc5d8c01e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/453] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 399037dd6b799944b940d6923e18dae1344be021 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/453] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 648f4e8ffe89d2cca127d4073002a57b32d3dd9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/453] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a8acadd9cf54903f020b404872f2e4133695184e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/453] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 866d4328eee669fad0d6dd12c97d7c01b9876e6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/453] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 25d6a8eb4ec76ad9ae9403e19afed7e8d93fe1bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/453] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 654191876d5fcbdaa8f65bb295ec1969c0517440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/453] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 3cb45fb3db0357d0b0ef60cd4ea9216122567b26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/453] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8563efbc41cde078e08d80ad62a14995d84ed95e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/453] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From f058c6bd640a3ec25ef74662c04476b84521c7bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/453] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 9891dba42ed6ceb38c9bd3718498bf7df412e0ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/453] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From bd179e7bc1be2bed7b7e8d97dec32a1d3e63209c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/453] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 53ff8c7e9c6d0ca23000c77258e56b88beca3030 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/453] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From aac41f76e3e3ff8303bd56687d27d3a21e595713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/453] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 94928c2ac071929ff740ce1b9f028099143072d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/453] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From ac5ed309d3464152f6152aae76a1b268c1ff0bf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/453] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From affe908fb26e50a6d776ab419b1d7005b3c90eea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/453] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index e21433f132a..31fa1129a99 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 3f92ac56a2069038b5ad501f5820520044d92000 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/453] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 6f6eddff669115c3fed76e8967b752f6491fc4be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/453] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 75d8e5d8d53..bd6e2752599 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 44ed5c7d63cabe9184b9223e0e06d2f142bb8f55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/453] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 832c118d8f354c1fdf418dc3590317bb6d847b37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/453] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 8324b36cf3f490c4c3115d11b7119c4dc5358a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/453] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 35b800c929d06ad67ff603de1c73adebccbd55f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/453] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 3a246c727a55803a3e70a936f6b6d3bba2b9cfca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/453] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 18f0f16992c36375ce746e05897a4873fbd928d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/453] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a45f74e58c329cf14a1028d316f876fc05393816 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/453] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From d445ff5c307f0469248f9eb41ba04aba2a1811bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/453] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 51c8cb4954f71ee6aa87c8ad670b79e19a77830c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/453] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 5c573bd63e7b2192cc970adf947792bce43086b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/453] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 5ebaccb968b153da38c9826019b73eb84ac42526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/453] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 3a1d12679c84e432ef5b8ba78615374ae00657a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/453] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 5b1442d7d9201429f2f6e70a97e2573ead7d917f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/453] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 6365ad5e5da83ac5d2ce3a6628541c880278cb96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/453] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 2df0cda10f8fcd93dda84d1dd52f7b8a11b686a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/453] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From b218a311f89a9b12c8ded0ac88e3b5b5ad5b9bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/453] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 2e8c03d28cde79bbd08ff3689daf0e7f6050098f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/453] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 1445786b4d8e3f7462e074f8490bf782e41bcbc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/453] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From a9c0ce2c3b8adc6d87e5d78c184fa4c7b36edfb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/453] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From b699f584fbae654161dde2ddacc732723a60688b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/453] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From e4e7460f5f06a4ef7fd37de56a85f8502f642bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/453] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 04af98a0b7bfc892602b56faeb40ac5a9c81d635 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/453] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 5e09282c66d5217bcf72196b370e560c6f649b98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/453] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From e75f77f22a85ec54e249990d2aaebb892b65c297 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/453] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From dbcfb22d64306db2a2176b5e943aebb816b5cfa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/453] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 26f599e84eaa328d0983c18cfbc4f717a0066d69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/453] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 13d0130f1338dd56e09abb107105d69541e0cf64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/453] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 8a7ec14ce8ef3a7f12c10084ac9ca11890b8fe76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/453] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 5768cd9911dffaa1b9c841ac6aa9e073fe0e684c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/453] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 9317935f1ec5c07a80341dfb89c330906e0b55db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/453] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 482b27593980d4486a305a9286b11b3f1641cd41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/453] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 977a98af2f199422a196f39a1073ba4771972b05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/453] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From e0c4894001cfd0e22d857e8bc0cd7ba603d2b94d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/453] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 687c30f30db2a21e6d4ffc6ca43125b7cfb2aff7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/453] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 33bc569cb398755f4dc2a328abf8401bfd24115b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/453] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 2c3bc1f0ae3ab8b21cfc7227a15e17717d6561c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/453] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 998cfd2e10c2f4bd9880be1cc03abb5439eb0c7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/453] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 32c59102d7a37e371059ebdc97e241a0d71187d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/453] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 669688b4215e4b63c8022a6248513a87d4123a53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/453] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 9c371593df704e5cb95185c72c0b8a728066d39a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/453] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 215e560a702d5f25bf91f638d41747c12765507c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/453] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 845930e5d87c2f107ef202eeb5592c68fa97cea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/453] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 4bd22f2064da52e7e4d73b0bdad9eb8526c8b826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/453] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 9ec99cdb13b01d3f49e6ecd349497c8abf41e365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/453] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d..786d3992ce7 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,9 +2,9 @@
 pkgname=nginx
 reverts="1.17.7_1"
 version=1.18.0
-revision=2
+revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 275fef7ef0c66d2cfabe995b3a10a401ae7be895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/453] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b8dd6297b52c93fac7308c25b8f091a512f55690 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/453] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 14a22a8d8a77e3a6c15dbc3b2fae61d3fdd99cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/453] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 36efcc4a2e1f9630cbfec726866de02c63159f95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/453] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 5a6e41d3561f16583b98e188569336ebb4822c43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/453] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 04b2ad29171cde12a58226d43cffd1884cd06f20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/453] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From b113a0bb4446a76886c7ad5bd74c6228c7c23c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/453] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.21.0
-revision=1
+revision=2
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
 # remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
 wrksrc="nu-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b3b78036774b92aa90ff7c29236a0f335c69469e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/453] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From efd72c1d86466781d474e29ab37fb5dc87ca88b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/453] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 7e91119fa447208f6ce1bf63d77d302571f3fd72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/453] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 072ba6970b71de7d91291d93c2c56000fc662de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/453] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From b0bcabdf5063afaff9a7331db4119c6260bbda0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/453] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6f..5a50ab3f5c2 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From daace104dc101d0440610b19064f9c3fe83d823c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/453] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbc..5b47c649eaf 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.52
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 3fd42beb4859cfa0b0aa461145386c912f9db4b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/453] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From f8b238165a03a4a47c8480805b0547955faf2372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/453] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..b582821ccee 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -19,7 +19,7 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From b5e95115ad3375d17ed993b7e89e3dc2c43d3870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/453] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From fe084dfb731d41a573c60776afddd2361e5a71ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/453] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 941a3aa25dace9150713e6838ff7cb962118ec79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/453] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 879ef89755df81a7bdd09d76f2ac42fbde77afa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/453] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 59c01217d8e0c75dc36757b85ee288e034bc4909 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/453] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b7f22728744f6afbc7f202f0f482aa323d7aebb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/453] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From bdf0fca0357f1adfe95c68c2fc23c9ea7cc6c3db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/453] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 040cfe34870da3f5a3057ddf69e034e084d80b4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/453] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 91f25c4b0cd5a1ffcfd6dd83c7b384abe0f89577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/453] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 5cfa1a46f2f175a58e8b66eaf9fb58f46d922a8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/453] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b2fb01a8057232ff0f2378bb753c02ca685cd675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/453] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cd1bd81097a00edf8b48c923249b5790de5e2994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/453] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8c78e8eb455834bde62a464a6308f55f6456d2c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/453] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From dc1e24e0f7b645ba0e429411ed2436ef8d53c5f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/453] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From d0b57f0a9fb3e04227a3956d2c3b2c673efbb150 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/453] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 773844aee95e62cc8bb4059d942fbf3acbd9f5bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/453] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From b4819603f017347a93f25055d9c4e4d1d2261a56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/453] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 5e0a7fb02b24fe23d8156be02e985f2e9a333fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/453] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From ad186fd4f6b71dce4d12946afceae071eeb6d586 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/453] pgadmin3: rebuild against OpenSSL

---
 srcpkgs/pgadmin3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..7c63e3bc5e3 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,10 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel openssl-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"

From 7be956757728726232acb0bcf450abed1ed26003 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/453] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From d1e14f7c7f9c8013343b6fdb7d43094fb36a322a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/453] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From a7fb73acc4cea3e5b15df7fe51b1756ec43a5843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/453] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From a55e4e27506e2c6fad418fdac50fe1d1acb2dcb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/453] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From a7649418cc9e284a3651621209e00f970d989b17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/453] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 2975f3fe6ab3e067c66ffe23666ccfe7eadca001 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/453] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From f9dfc09aaad29643e7602f2d97c32e78bfe21964 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/453] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 033ef2b7afd0f4daa83dcac08c9603a8aec7434b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/453] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 0e5ad0ee81cc2163d69202c2a52fe771c3120b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/453] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 4e3cd48ad141e8fb22a59048a0119c4dd43aec73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/453] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From a66191c2ca817c3fbc9333aff3f48e66df183bb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/453] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From f79b5d8e86a9ddb97e9966efe08e33e87f7991a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/453] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 18d76df319716ca13ea7f30d15f8b13b0679a376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/453] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 52f0f383c2f9b0f4db9f9c48c434c888d3f0dfcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/453] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 4dd4967ff619ea61e005df38b6e197f33b077fc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/453] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 27140f74245fa26bb255546bc7015ca9e3e91069 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/453] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From b815753e450dd6345e860ca2ca37aeff29ba924c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/453] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From aeb0fa92f6b2fdf96a82c52dde4ee477d2ce5c0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/453] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 952b92c04bad63998380ee1bc3f7f2220b5f112a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/453] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 7bca5813f8b911c91fa38c186517e3a2b4f736e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/453] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 59a1b288b5c191ca442bc135232a79d401fcf097 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/453] qingy: rebuild against OpenSSL

---
 srcpkgs/qingy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
  $(vopt_enable pam) $(vopt_enable x11 x-support)"

From 56c8b1e8e11694550cb0d49d371d98d161544035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/453] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From d033a74f648e864c86eb90163ba86b7e3ef66f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/453] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From aeb3bfb38ea86138bee04ff20cc5bce6eea87a3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/453] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From dcab6364f496c6d3e3c7c44456340532cee74ed6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/453] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 21f3debf94989a25ece497b90eead06993cc6aa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/453] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 857c00ce2dc649a6cc7d4bbdadc0937a3421798b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/453] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From eef59b2fcfa8dc8dc7d0bcea15e859491b61fd38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/453] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 9e8190581543979f15d826968ad6aa2b5fda3dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/453] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 41a01e7c5536ff0039b349c24f69dbf7de0aafa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/453] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From b8e08ad07d4d8e786fd01f5e395128645220b39c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/453] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 338a054ab8c86bdafc052f72de1be67bdfb99415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/453] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 5811f9d03d047ec387177dc593526b4c4dd2e468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/453] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From e71d93e797ae80a1b6f262fd040f31e3b58bebb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/453] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 6792b83a7c2ad1c510953d71b664fb35e1f00602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/453] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 25397a7d1eb18fe5e6362ee0ffb5d574d29be2e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/453] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From bcbd0cefb8eec72f1e5ced559c86658dbfcad3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/453] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From e516a24e6de0d43559824d8bb55185d6c78f8c75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/453] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 4d94068860b1433731677851ac8c9bdb78174939 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/453] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 484faac7986b5df6adb7f86f3c88d87eebb6f900 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/453] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0754c76ea5ff4b036074b2f3d08cf6960b9fc765 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/453] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 26df347d7b3cac11d6f470f2fae4bd7960c999bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/453] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From adfebe2de5fb63fc4aedb481e98965273ea0f761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/453] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 8379118ea2f1d192c544dc43d3c4c59d59f4a2d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/453] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From ef6b3d8b3809ce231663fcaaa2cc91fa06a20743 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/453] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 63043a2b06265200713b0acb360e2528ef96b2da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/453] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 8a56c0cad5ff66340b0a10199c27d5660f5f674b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/453] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From eb0b66acdd6ddc980f1e566a305ffee992dfcfee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/453] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From f16f82b5959bf3a7db595f344a7935c7e21a654a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/453] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From aee3c163d7702d3ade9750f800982c67f73caa43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/453] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 09518985f8c86f0b0508537df67926afb1b071d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/453] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 082d9ec8a9e25df67d8b3f15be0940b5996e915e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/453] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 84ccdcc420be561d91577423455d5ae781c25ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/453] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d2b69e0b9912ffabb37acdfe43f99c3e26a0aac9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/453] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 5328beaeada05592a297e24c0ba14778e04f2a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/453] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From d0df296e8cc8b2ff300f1eaad56d50694956f9ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/453] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 57688a24b0175e8c147ba3ad72887ed95726aaae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/453] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From d2538776d9f6c8e7f5e87f5dbc039b1c93fff7de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/453] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 8d81fbc6cf7381c6457785d5033217a690642e44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/453] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From e75c1ef7bb10b763f007498fd03b4c2fab416bf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/453] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From e89ff3b5cd6917433dc6115a1eb50a20abb78ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/453] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 756815551aa49e9446b00767eeda9d0aa3b3b4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/453] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 82ce0fca9493c4553f9bcc03e2778e7557e5923b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/453] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From e454a0d6710e09a8196a4deaa55d79c979613358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/453] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 539387db6519aa3b49c5069ca5e85d51a50a8d07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/453] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 1cb9e5c99bd2fb87112086941a3659decd629e07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/453] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From f794a26d169f397721907df7882bec22a3ea923a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/453] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 34ab717deb2d616fa1e7ff9c6a8b0b4310406956 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/453] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From d2b94bbfd2f220ed4797074d50549bedeea1f241 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/453] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From aa07da43021e13710a4660fd3b293850d3e57d62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/453] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 486c1bd7601f50733579cd2c4c2d0cdc0945412c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/453] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 2bc653b7da84c5717df0fbdb8f14fbdc31ad897e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/453] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 294af84938f7b2f591ea35b12de782fd43588f06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/453] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 0f1a07739015cdc8e30486bd615273dd1b9d9431 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/453] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From d75af4fc122bac18614bcda2629529ae6b469fa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/453] telepathy-salut: rebuild against OpenSSL

---
 srcpkgs/telepathy-salut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..367ae2b7803 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-tests --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ openssl-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a6317f99c36db8430ba3049ad1b2f32add22138b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/453] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 21b5e2bc5f765d0753d3bfbb48eaa866410e2b27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/453] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4c40b26489b3be961d9b72ecd3d95bc89fea204a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/453] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 805bd6b1fe138221e4530fc14f977243102fcd13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/453] tlsdate: rebuild against OpenSSL

---
 srcpkgs/tlsdate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index ccdbef1a5d7..aa3b54b4c6b 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,14 +1,14 @@
 # Template file for 'tlsdate'
 pkgname=tlsdate
 version=0.0.13
-revision=15
+revision=16
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
 conf_files="/etc/tlsdate/tlsdated.conf"
 make_dirs="/var/cache/tlsdated 0755 root root"
 hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
+makedepends="openssl-devel dbus-devel libevent-devel"
 depends="ca-certificates"
 short_desc="Secure parasitic rdate replacement using HTTPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From cc0e42040b2e1387e5a2b7d0e4001ae1410420a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 321/453] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From e322885a7dc46d46eb8fbe61431ce600f7717859 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/453] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From e93d983aae840872131cf5fb261cbd32d032c420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/453] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 0c0d58f4f286699e7276bf003dca9f49782aed7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/453] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 6e0bfc874f6232afa947dba52c2fd695f2d47417 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 325/453] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 22ad433c6a87104b4ae72a23382173e4911bbbac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/453] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 805d6a31169884c39dabc4f0229765b2a836ed77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/453] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From ed59a7cea46c027af74993236d04328172548421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/453] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From ebd4128cffffb2ce2c09cb4d38679c3ae5b83ec7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/453] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 760922c9d95d4c9181b58796a87ccbb5b28e3840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 330/453] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 561e7e1f8eff14de847bc6f7172da9a40caac467 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/453] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6bfb2e3cbef6e8719643af3c85efacf6fa3b4b9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/453] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From b4db984a1557712fd7564242bd2b42b18c450547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/453] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 2f488dcc3c184d1c1cd15b4cd40b385d52d2b6a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 334/453] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 8ce442cf83ddf24719a3409917818c109dc47f0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/453] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 70889bbc1aa54b9d2e91dabf0990cbc44d0fc1a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/453] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 1badd31007d67cef469b3fa187621ade548144f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 337/453] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 518b063828d31cc9fa22d7a42123a6223b567f0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/453] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From af0a4c346e62449ba4859856ff73b3ce7245d3c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/453] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From b1b28037ba231cce1482d56626a70471ac0f62cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/453] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 517b7f75bba22f7d8d8c115e5785c5116bf37620 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/453] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From c7f78a74be26b355637d6eaaf5a88266c1a50e16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 342/453] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 672710ee306a1b39d7faf1d9259dc4f1a62a7878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/453] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 3dc42653e21dfb365c03a91f9e1e4f50da900f36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/453] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From d3c42afe64429ab23b3b91e76f059acf83cd4fdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/453] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From d95c999c52558af901142e843829a7b29af6ba54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 346/453] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 590ef6ee76ccd3f0aa776bd581b1e3d87dadeaca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/453] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 938e6b04ff174ab7658e654c879e07456b6c5ae6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/453] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From efb456561be01635e1608a8377a3773cf6c22a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/453] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 25dc7f9aa7c67821e762866688afcce249c98a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/453] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 0667d4d5e49b84c39aa35c8b4bbca9d18036de42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 351/453] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From e099a301a90c94d3c1749ad584dcee754709ee6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/453] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From bd036b65eab007a3936c918813912e6ee1ad2578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/453] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From a8e2f4e4323f89063bbb4602d8b99b2507129c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/453] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 3924ce4d66da4a9306f185c7d2671ff761b26098 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 355/453] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 71e72a027628e269c599811f39fa6051543a5dde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/453] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 11995a7469277da27823661f468d35a7b4409121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/453] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ecacad55d1efb18b172ef845ea9a62c407069a69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/453] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From b955c648ec915c87fd44b5f7733699e50893eecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 359/453] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From bc53efa3535d8ce889f1d93bcde19a43bb897395 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 360/453] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 23dd0487971d300906030ca2cbdc134c4fd76b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 361/453] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 461b534c9a662cc0ac7d4f584f84342045f1fa3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 362/453] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ebdaf2d3689c0187244a074b499b123f17adfee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 363/453] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From ec89391f62b0d4dfda318f7b97226228af1b92ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 364/453] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 9448c90902d130b13006ac06169ac6019b7d5f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 365/453] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 062441b6ad13929bfdabb057b2794aeaf7fe2662 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 366/453] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 262530dfcab117799712fc1d2d3e8a4fbebdd6e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/453] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 76303e32998fc979b3a9a3c500e49924b8138a93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 368/453] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From cde34149f1c6428bc075ef9dffc5c7284caaf7e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 369/453] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From cbf771f5f9866a5b76a60a394d2de9f5301280ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 370/453] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From bf005a50f1a246de847361bd103f1d49c38fca16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 371/453] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From f49cf848986369b7c52a119e14dce88115b60d59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 372/453] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From f0e141bbffdc00f2890dd7beb823365f25ad8d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/453] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 3304321d6e8f70dff281e7af758384bce4a5d394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 374/453] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From c0db8f1c5c577d0b9391e70f61661333c7f07117 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/453] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From a27a908d8d05ca64bedb6a41b71fc1186940a591 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 376/453] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0a7c2fe72b19adf6098cd4fee0035292a6c5db38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 377/453] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 0b7d79c72aa73c15f3b93336466d9461927f071a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 378/453] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From bef9283defa15f176544b1da4db87b4a2918b297 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 379/453] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 96f9cc505539015f4e5215858848a63d607447ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 380/453] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 2ae89b17cdf374f0595fcfa56e0d57c035a6b010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/453] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 06bae401181dcc211e149423f6db2354a4033fc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 382/453] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 873d0d9d0dda46a754c367cb47492c388b737ab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 383/453] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 1ae1cde1deb3f16b46189f89ef8b06b095e421f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 384/453] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From c31f1998e15c2d763dd395f8e952e5ddf3c5bfd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 385/453] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 2cc8d7a06c4f10e23746b5b55ffe6e985ccda3cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 386/453] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 9545ae2894d51d96ca1cc27a6976258e25f007ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 387/453] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 17f18bd82be34fa81bbce08d472c101f6eee8b41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 388/453] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 11921f3e0f12a9a7613b12a028087b6cd982d788 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 389/453] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 29d069b7b5d3c24cd4780844876697d1e99aff82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 390/453] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b678fd64c9fb18abe85321ebd5ee94835e15dccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 391/453] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 27d0624263e8a4f83f50623894c545906ae0d783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 392/453] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 109671bd1d93f480ae9863238ebd716fc23482df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 393/453] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From bea0d53a8935cb3f31ab8e70e4588ae7583a68a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 394/453] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 71ff88fa591d17133561f031ddd3f6100985f0af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 395/453] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 63c531018863c0aff21e92bd7049bb23eefc45c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 396/453] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 82c54f0d75b5e78459166e888e7ba756c7c382fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 397/453] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From bbb95c52f965f840439b9cf3753fb5b247d3f3d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 398/453] fixup! Resign as maintainer of all packages except
 xbps.

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 55232a6b90b7decbf668c7e096f485ae4b05d3de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 399/453] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From b30147b24cce243bc65e8c5f626433e96a0860ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 400/453] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From a984d71101db1799f902387118c7df21545c40b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 401/453] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..75cf9c33500 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config python libatomic-devel zlib-devel which
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From c9847925618dc384d9fabd2acc6de5e952c767cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 402/453] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From d577a3fc1cd0be7308a55afeabea2209850184c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 403/453] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 08e20d5207d059ef49ec170afa6f55baf9a731c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 404/453] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From a74fe0981f353f6a4a3e42c02daadf41fabdf2ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 405/453] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 48cb54a7cbf9eb0cf16812b8bfcad3a1f203d7f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 406/453] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 33b64c3d16d29c5efef5a466a781c01977bdf533 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 407/453] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2a69d8dc92b20df5fb5f56467d9c4b1742a13ac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 408/453] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From cfbce8b61a3d87f7f043ec8142e93de4f144a183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 409/453] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7bd34f4c08424947c812b44f046bcc14f407258d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 410/453] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c0b27a7dbcb312963bad09bbd5f560d71cc16215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 411/453] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 44c6b8df9ded39abd0f5c2196425d822ea1f6df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 412/453] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 896b62a8e6917307856d838c1e3a59f8650cb77f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 413/453] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 84cbb32221cd1d98d84e3122f1573f71756351ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 414/453] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From c25ef3b6f1074ff565146afe5a54b8c21cedbff9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 415/453] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 97d1c903353f76725f59562fb7d021bb5fb785a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 416/453] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 19b1083926e486f4f32bc0abbfe4c31070a0827a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 417/453] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 13d6fbbf3b5bb5190407cd50f7744bf006c76337 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:00:19 +0100
Subject: [PATCH 418/453] rkt: rebuild against OpenSSL

---
 srcpkgs/rkt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..0eed248718c 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -8,7 +8,7 @@ configure_args="--enable-tpm=no --enable-sdjournal=no
  --with-stage1-flavors=fly,coreos,host
  --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
 hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
+makedepends="acl-devel zlib-devel openssl-devel"
 depends="virtual?rkt-stage1"
 short_desc="App Container runtime for Linux"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From 29c836d1c07542a501adebafb3cd591fd7efba28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 419/453] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 1c9ce2ee4cd5819e4ddd63f62517f135168c43ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 420/453] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ab7a8485ed984017cd609d4efeebdda6d56424a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 421/453] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 5fb94f5b47b9f870b8ffe776ee57baab55b216fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 422/453] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 6475ded5062ac9d36de8068630bb89a65b4f8809 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 423/453] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From f9dac279a393139dabc855e748171576f998784e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 424/453] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 5114cf2063d7ece6fd02392240e96a42d159ded5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 425/453] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 5ae8aa9b6bb98ed3512fba8e8303a33082be0ed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 426/453] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From baebcc45b83daa3a3fbd4f9dec1514615f34b33d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 427/453] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 79c8f887537d7be3be68b8313aa2c745551e1125 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 428/453] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 1221ce54b16db60d547f22a7210ab688fb1ff810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 429/453] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 00ec259886964bae5028893c4b5f8012375cd972 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 430/453] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From dcc7938e74a0c64adc852d924522fd3d3c7878ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 431/453] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 1f5068fac36401e6b5571f78d4dd5ce96dce1503 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 432/453] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4ccbd978e875aad1427dfa13fdf61ae9ce5ccd48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 433/453] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From d325475dc5bd281511047a90fc1b86a6c013f745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 434/453] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From eb7d7aad67847932a353b81dec9d6079b5bbd9f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 435/453] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 6deaf4d7a4c41de6283a9dd0fe49956766dfa00d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 436/453] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 60d6c89a5e3d8d981e5494f0755090ef5a283593 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 437/453] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 4332cf84881f2ab181fb577a21090fc175dd08a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 438/453] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 527195202a723ac672567a5f18e725ab0663e760 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 439/453] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From 57da382f1bdf4e1638145b3f65cf7a8ca32ed017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 440/453] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 5f9e9130ae7ea25c725c09251f22bd3d56d31232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 441/453] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From a5ba6e28052e97b863ca4916dac778a1063aa54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 442/453] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From cf9742c682ba168c8e887fc423f6537a957b7fbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 443/453] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 49c2132a62556528d1addb850fc87bdc426ed54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 444/453] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 28a473784adcbd64d9a7ed0e16926a4311a40996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 445/453] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From d2937a97216ab9344f9fcbad95db849b2cf686fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 446/453] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From f03eb01d95f954b50dc52df26c8985e07a8cfd5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 447/453] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7a..87491d9fbba 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From c7d253d1dbc5f49dabc4ef784e3d1f8c688af460 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 448/453] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 2cfa7cdb5e6a2ffec4289306bee493fe2d31817e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 449/453] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f..ee751c6216f 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 6d0f874cbce70485ebf917c6ccea234f0e3af469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 450/453] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From 5853bd8ef91f0fd9deddccab0a8ceda162f5577e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 451/453] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From a62b3977388539b61aca3589174f541052e58235 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 452/453] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 467751007caad7edc8515ed4a9cd696ada948674 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 453/453] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  3 ++-
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1c869a6950f..a344abc2901 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=24
+revision=25
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -212,6 +212,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 554292 bytes --]

From 2d4e25113d24ce1c59219c2981d6b33296576cc9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/452] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index fda9284996c..98c295d0bc2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From cf463b3f3e012a9d3ef678211012e8a276508b35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/452] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 38cf1255c281f53236f8a23b9303b9c0aee5e256 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/452] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From a2bb705b07e048fa35751839bcd08ad5fe5344e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/452] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 9fd1107cb0b7dada98434a9b61dc29e3eb80c799 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/452] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1c3128759a5972abd934fc57b9623ba2540783d2 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/452] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 98c295d0bc2..d2e5c70589b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 177c1c1accd283bf14018c9b2d5464bbb175dd89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/452] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 07dace062dace06a6adc0a6df5102f38c707cf8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/452] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From c4e855b6820c1fd350bb850c431a4eb0b2a86054 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/452] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From f344cb9afdaf0e45923d1b9e95c503a7a55da98a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/452] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From 6a48ac8eb446ae0dc4b7687e98d02af3d63225b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/452] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From dd33309e1bb555ed9930aeefe73147d81249f0e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/452] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From fd1c411237244b285f067e07915bfe9845444b05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/452] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 7f7584029cd5f6ae8fe96cbd0d05aa72c2175afd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/452] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 7d88dd4490c5ffccf22ed3cab7f7abc8b0ebc5b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/452] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7f6b3432c27e4894217fbf3aa92b5b669da8f76b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/452] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From c9c97fe520bfd5c370f7b5548153692a86966db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/452] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 28907a721b3f3e4513eb3e6da761c911caf99801 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/452] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 74e87f69b8bf6c4d6a8270e26cebdc3749f7335f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/452] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5700c1b7d4111c7c749d9bb722023aac8796c32c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/452] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 7a9fcc8eb8f5b5241265af5b990420bfb602f46f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/452] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 807b3049ea49b235dc8fc6403c893105b9888958 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/452] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5841b03aacbb489fe5d6b2877708fe53a99520fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/452] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 2e1ef9124cbedfb06e636285060eaa78a7f25c9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/452] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bcc90d4f91ea96c9486c52b71611993610ae5f5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/452] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From a343ccad56e18afbd4e5d14e61f86c7563040400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/452] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 1d74e362e3a2cc6e24af3136e39afc066aa7b05a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/452] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From de943030bf91805a06147c96bd00f11d3a1e382a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/452] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From bfa7ec0feb1ee32a045d116961f512ee533ab6dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/452] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 18c0dbae6638594ef7ccbf9a4a2b704c5c968be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/452] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 658064d81699384c8bd56dccff3eef8d2d7588fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/452] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From dcf62dd5cc866b57a3b80ebba62843392b86317b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/452] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 728dd9f88a2b301271c23fb31ac72f9f0acf6793 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/452] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From d3778ee37646b4cb7e323673a0eadfad344752ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/452] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 9dad2a95cd6f16c5a2d42dab6188341e3528e415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/452] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From d9c17758f6ca230949e5e957523f2e5b720384cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/452] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From b6e6ba030ab3f0e79ba53d4b98818c196c1fc546 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/452] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 998473ea10aa13877f433b910e1abf726202d659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/452] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 49f903970d18eaf70dfa3c58a6d835059375856e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/452] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 32324a8c2c839d63d1a69194b7cd2b158972429b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/452] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From eba25022900891f815a9678bab6d3bd223853b3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/452] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From afde932593220c2b0935532425cbc5e4608a6732 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/452] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 2b442773eca7b7fe2e09a04a29e4631d9b141793 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/452] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4dafb47b6865b9a2c5a048804071e8d6619a1a60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/452] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From ae70b55ef8c1a1972fd777ca8054798a4cb1d5eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/452] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 679bf7439c014c5bd5984ef54167a5b1238bc7b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/452] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 548519edddf354f62f6b350e1267dd55355d8110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/452] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 6e02536657635675e679d0d9da7a92cd38822617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/452] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 3c9711f054b3386849177284a4cbef0aa422dce7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/452] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 1861a1a30fb189d09842f924c8933df4a2041a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/452] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 635d20511d2a83a720f4172730a9908506488e61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/452] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From fc31d031e3c249ab4827b7a66bd8b3c1fddb428a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/452] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 8c50dd8df29ac6cb7cfaab780359499d91d7e6ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/452] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 7ee6834b44700fed52f63bcff11af349c361d485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/452] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From ad4d25ef52080313308105c941b6b79f1ae26bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/452] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 2f725588a15e7ed4534f42cf3deed1c305e3f589 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/452] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From a5afa158c032017a37bccb4ef266059c3e9bce51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/452] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 2c0cd31ffd705a2266ec4e6c2fea57321c6f1c46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/452] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 4a361da16754bb31e8ff6e2be06a46c8b2bd58ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/452] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From b9d1bece926f370a49a236a4c5650999001d4e12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/452] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From abb1b85c64bd7d772de8fdec563b272ee9f8014a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/452] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 105059007bf91852474187cbd2b9689284811f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/452] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 96f5f0a662ac70c2c18f971e58035a5b5a2cfe58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/452] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 6bdf1b785f6c153f0a75a083f5f1b89352f854ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/452] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 4b0aff69b0cb393f5f97b96efa9f9830a5e286f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/452] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 9f343ed5673dafd988a93e23730ed03f447339a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/452] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 2c3f57ceb0bf14d2e4b047a467d4dcc07daba550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/452] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 6677ccabe07ee8106064cca0cc9238d759a573a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/452] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 0a54bfff18e0ff2233bff1852b5de8824469970a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/452] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 4e71bc35329c346c706777c9381b9f61ac8ecada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/452] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ecac0979818efffd483dcb6e4f6112dad0a1078e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/452] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From e1c05f44a3d57f26afe3b50fd393fad4f508dd60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/452] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From dd41d5fbe9f35c06ce3d3f9e224f5e12bdafff8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/452] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 57fdef56fd60910245393d9991667934a85b5671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/452] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From da513ac0868853d63f651d9fee00cabb17f04f6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/452] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 027fbdbed285759ac7fb63c42be3d99744a3ba9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/452] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 748d6930c387861e70c354761ff8432827e2f4c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/452] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 42f8ab7a1e027df68f541d47f9dcc0f0dc7ea301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/452] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e558477a70fffb697938992dfe41723edf7cccd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/452] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From ac9c288f0be0b4cf423440be8c684e4bbc2e5cca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/452] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From d2a9986eb286c3d71714f273d2520d3fcbd0cff7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/452] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From b5eb45ac51ee37391c0d1596760fb203a5382ea1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/452] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From f5216ecd37c566244df4e8c67732701aef7ed8ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/452] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 85a023b5545b6f40b0437c1c05fbe6582efa02cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/452] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From f87294f6a34f735303312c91b8cceb8081b5a84a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/452] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From b45143a387ec0a845c2cd35ee6f4bcbf52dec20a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/452] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 914dfb4d7ef99163b86ee81600fa1ac3429c2d34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/452] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From ce5457c2171f9370dc6f164529195310dc775ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/452] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 518c4a03381b806f7a35e3ef35c5a32f48858779 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/452] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 2fc1424f887d583223fee614c40f293165c51d30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/452] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 2cabb01a9f9ed1f82f1851c8f26327f83cf528d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/452] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From bd6d098a1d514510d6e7debae11c335eb8230161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/452] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 764abcd0bbdd108ec496beb03e79ec07c4129b62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/452] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8f7e953bcc204fe2e483883707967a0445fcfc39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/452] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 92dcf6f55cfca81ebf3a320d72cb9c0f560762c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/452] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 961e6d24b9835e98d64fe35cfa13b6ac459267f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/452] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 60a49409141a2ee7605b6c5228dfa0c27cc1725c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/452] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 86193d6ed2817de6998c6b8e48dd826a30023f78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/452] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From a4d6662d7162c1ed886e0d0c6fad6ba8ccc27872 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/452] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From ee74d1ab159338fff855632445dd50fc0fc6558f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/452] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e8a0067011e778107c60e2dee312352ae8ea0bff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/452] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 3b260bbaf98a4156947f87d1cdf6c989f269f1c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/452] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From e688e208c06acc6833baf65b7c094eb98fe74149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/452] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 6ded3317d7285f0062bc771add026d7a21987542 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/452] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 8dcd70da9ed42d709f7b8ae638fb790ab7239ca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/452] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8355fb60be22c615c0be037562e239fbf4d133d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/452] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 4b05d93a8f130a91ceb0949146d20e3012a5611d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/452] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 6911c2db9359447347fcae831349c6209b89d7bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/452] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 4bac3a3a4e7b8800e450fa75d48e759c153a4c6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/452] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From c3ab2c5f1274d3b2818d6bff8d715a48a693e7a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/452] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e0d666d5ab00b8bfa2588895ee9d6ca16a93dc11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/452] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 627d0815199ed139d6227a576abd643615887d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/452] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From a276411c27d31f9edd3cc451830de1f4ddd6a4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/452] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From a3184c73e457d0122502eb7407f0ea764560fbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/452] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 9b9b3405b61aa94edaea9deb04df3e7866546ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/452] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 5b0fbb4d081e9bbac83b8c4ea1e40d76de4b016a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/452] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 65db6ab40cb38dd14ca667905568c25b1f50a2f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/452] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From bdfbf1832eb000b7f4593ae303046f0bb76350e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/452] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 76f8f82aac3632101927955e8a6884224d09d361 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/452] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 25fbd34d8d0a8655fd7bf85703b6b97290bd42ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/452] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 299354f9940ea89de12fd96248582c513c3eb1f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/452] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 9eb0017ef864b0dd4b4e5bd0a818dc0993719767 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/452] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7c14e14bf3f4477fc65edbc25290737bb8292377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/452] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From f1b9699ea363d0c115d5db5a04a63af77399034f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/452] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From f1e3af1605300f344a5d27ecc8a645c9212e4532 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/452] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 6149e2641f7f5755acd2e65c987e326af1aeb97d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/452] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From ac840a920360ac7e2c772170e34217825f1a4ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/452] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From b5af0219e26389107af76251d0e2525ab139d777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/452] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 18053cd46172cd3af3d9d9a87d428176ce1d2f8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/452] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From be400dd21fe9adc2ed117f42842f3b082b562920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/452] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cdc18739690f27dbf93e496e4034fb59f2ed87e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/452] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 6dfdc04865e6dc04dc6f97dac26b90389c296eca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/452] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From bd40528183b1e2bdf8fca5455b01320fe93144ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/452] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From c23ceeb751fd11a1e40b238fe04aa9672eaa7efa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/452] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1a12de3ed568dae34ea0baed7e4b2baf088bcedf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/452] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From baa21a435067e3375bd8791827009db18f7e0ee2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/452] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From cf5cdbcaaba1558c317c34a0afdbe8a18211108c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/452] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 80e8dc7f46a4b548686ba104d067550284be85d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/452] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 84fc27ca4c8f00649d819f1dbf79560768f69f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/452] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b76e2578e849b67a6f6cb2962150fb95de665e93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/452] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From a5e70a5e119c69954b3e4b395d3b390ba3d2d7a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/452] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From d55b6f62b65cf0811fac059469ae580754bf104c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/452] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 9972260576f875a94b221c5bcb3f8017b3965f2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/452] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 521892a26b6fa0dfbc983ace607f9752c6d666c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/452] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 52817ff895ff8c0e3f62faa418cb24ce740d6878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/452] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 4f96b13b1c248983e811d805980c2bae8ee72f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/452] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5f2e3258e2a54ea385426604cf31494fb3db2859 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/452] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 822938f9a27bf8a715e054cf8418fc6e2726f230 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/452] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 882fcd59e0015765849f1b3eee9372280056b96a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/452] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 6730d8a8d5836aa5e0603ec8055970584391216c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/452] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From a7761f131eb3c0e539f2e825d3eda4cb6362ab07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/452] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 039f7a9a1e33d748f2f3a84eb35190e993e326c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/452] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 098c95bc225071ce3d6ecf8af308a58f3bfe6f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/452] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 195e8532cfacf5395c41b5ccebd640582b0d703b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/452] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 534405b7cc82d0e3f9de415b189e57d2e7d5c696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/452] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From a20f534c67d10b62c7f76ab21a1b361da3d4d058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/452] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ba8b7678f65986570ce4eb6c1ac3d6eba8a16ade Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/452] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 7c0ea92031cec731d86cc0b9ac8f5de1775be459 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/452] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 16299074c7fc5afb0adaed9cae895c33a9e46f49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/452] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From bf77ba39e0fc908d598b548bf6d276114ebbead6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/452] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 9bae36752b32c1c5d83550bd1f2b6e87b574bfc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/452] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 4e70b7d0bb8db94d9b9f82893afbd46c16df125a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/452] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 12b6d091485b0f6c4207a047297599644c9cfd62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/452] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f40107b04cd82c73577b1a0d907e8645986fdec2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/452] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 420032e098dd44157b21a7411b47072e7ca2ea83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/452] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 2a229a74628cb1c35722feb0e7cd071799ed5687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/452] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5e076d49111669aea33b4476ae5314310009e089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/452] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d9029ddcb880796a76918e266887339f26721c2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/452] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From e438156067f8061409077ad3a5412eb3db0a0da4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/452] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From eefd78ed3afbf84a49f2be3c0f786261fb905912 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/452] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1ffbb99264c66a7a4062435e71bacd692b392ae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/452] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From d0c095e03a6bb3b5454fb42d959588dfb9851886 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/452] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 283a6c8c48dd59ae571ea1ae1e7feed146522b8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/452] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From f241270dbbef9491817db33aa55e86570caf2eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/452] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From ef42a9a3613b094d6593efabe3ebf5d496958c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/452] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 0622a00359b0884f6c66437ec5cdfd135c20819e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/452] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From bc024e805f93d7d7725b9804b471c783f228317d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/452] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From faef7456538bea47543b4ae77cc4c5070f6d7baf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/452] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 93d23d2589ca6864fb52e97c2bb91ef0000f68b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/452] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 3335a7decc1d8d7333079c33d96b994dfc3f9ed8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/452] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From dde5f775e18adb3932d1db48cc429b1788fd7b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/452] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 2539ff9b0db8eb64814cb06924869e8b5bbb1242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/452] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From a7656e091206b1a4ea15b1d8fe45cef5a8631eec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/452] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 6832322f22470ceb3a13c4db4d2ed664a77b22ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/452] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 33adc74804c0b95a53ee22da9397bc11e9780a3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/452] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From b14bc5fef52211ff5008847212067f7f2c8a85df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/452] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From d90deac51a91e580b3c74b03d2152fe2f08d396c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/452] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From f6445ba2788683f6dc731aa44821b22aa5b9c98d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/452] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c3605afa70c8fedf210751a0c52453fc4c8e7255 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/452] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 0ea72e258c24ad70f27b14d9cdfac8a5f2c3417b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/452] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 2d4fe61bd16b8d622826e407552307614e761875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/452] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From ec8323ac75bef896d83a6ec3045daa124d53efd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/452] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 7b1d0f7d74c174802e03b113f4281f60de1a874a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/452] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 851f3419cbce37b5c7c87c22a76da31ee7a81ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/452] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From ef45028c5671876a9cccfa5831ca4395241fafac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/452] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From d7d75a76cf0478ba9bcb5e2852da0a15fb9a0143 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/452] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 03106030f1ece86028c6bf5c689126261b2057aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/452] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From f9976fc01297b09d1a9e7afc6893384a11018903 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/452] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From d70be654d3584b99ac4c6b9f7cdac257b6a27552 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/452] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e5b4ba1e0754246d06e16589f2f83500de8ff358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/452] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 05f1be947d14f8f967426cf4e841413bc69b3182 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/452] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 1d453083d6706c92aed08605b025f6db780fc1df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/452] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 6d9a6586f4a3f23d891d600093177bd32e3e20e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/452] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 650d9601e8dc7d6e34493abff95fc22b76100c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/452] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From f95244ae2eb574fe5235879357e8cace6a3f2985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/452] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From bce5fdd9781ff7b169c3038e04db79078194b7be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/452] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 7d74256c9da504d53d115e1b42c063c71be2db49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/452] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 510ae4a80af0f4a6cf2855a43bc5f689ad2f266e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/452] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b49e7f080502381e92bc2d413aecbda5b6ef3e40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/452] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From d6969bdbfde0c91d036aa4cee5838c3585db2735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/452] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 4d6d788dcd4214d878dbfb04562cee90ed948012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/452] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 9c2b6ba6c920dff7d6ffd65eaa2df7049530d6bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/452] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From aa466ca738f351c181efa0075f62d89a5d7172b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/452] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 3aa0227adaf0ffd022e90760fbb945ccd99b4f17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/452] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.21.0
-revision=1
+revision=2
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
 # remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
 wrksrc="nu-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f3574a5b0c2501869149429683eabfa876cf3095 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/452] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b4f44c386c09da66fc5cfaa9e33f18d2b04b4b85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/452] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c1e03b53c50be5cb31911bd5bb9335670709baae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/452] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 3ef053203c2ce4e35e3e506bb7dad656bc1bf468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/452] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 95c73b9dc098c77dcd669ce01aac6269a92d8cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/452] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5266a8964527e73d9a486842671578875d221867 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/452] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index c3524b1ee7f..841cf927843 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.56
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 335ea57a462301ea2272b5ede642e56880c7cde7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/452] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From b7c2decf3b56e50a8c3bded4fea7a36bee389d59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/452] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From fad4e5ec559b759c0bbe5e6c353c23c37fa953b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/452] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From ecc51f39ea3aa53feabddc77d4311bce71cdb723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/452] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 0e8be4ffce31d5fa4ba37347b69b350025b74cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/452] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From b5c1db887439d4f88e71c038019acd2e9882e42c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/452] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From a42d18b41d2cc266d5e76104b5fee57ec0e775d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/452] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8db09e2b8f2324961bee39490e26b19d5115e4f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/452] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From a5095f891a3f2fb42665b9c0a9f64079a8cb448a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/452] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From efaa767f0a8a839da05aece342804a917ebd6308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/452] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From bab94798909df5545e5feb8fca891486d4f284f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/452] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 6477e8fe1911740e662be6a4b3521f086bd08595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/452] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From fca9191f2007b3aba9e9dd2b6fb81ab1d2c508ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/452] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b455f39a3fa49f0c3c873e3fab6cfe0174e5303b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/452] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9be2a6ad182343be74f3e07eef07236934cc1fb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/452] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From cf6dfa7b0bf2e85841de8e0f0dc3dd2383b6cfdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/452] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 8599a762dc2e6c96f39ef99838cc131939a23837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/452] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 33acb791c557000401da0a05c3f56d0e19092e27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/452] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 4c9570d04858c90b9e2cc0c4cf99d40c03d835c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/452] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 885e7332c7d41c642e6e8f2d9c9152e4cc959922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/452] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 9c58673dbcf765de8b4f8c49ef01b925a7eacc9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/452] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 219d629506446249cb2690105311c60ca28e0e04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/452] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 37bca70652ebe0a7712131a1e4d3cac5471c8eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/452] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From debca0ffb363a3cd7718de602167295956b86303 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/452] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From f7bcaa4991c9ad9f2c0921134f70a96eaa8fd34f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/452] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 1966f6f52e422d26e285d0229c78300c6f6f3f1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/452] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From fcbb8f6eb179796a406ca62dd5fc913bcd805ecb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/452] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From c1a499013b3641fc1aa1ad8047a765e36207330e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/452] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 8d157c0e7a6d0e65491aab7d3b00d54537755b11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/452] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 85ae7a604d0192af9cecdf367596d6b98ba41657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/452] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 33c6d88bbdc285761d74984f2e5db9879f13830c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/452] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 810485bfbe0fc47fdae43b4a1d03e5b6ccd55dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/452] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From b47e35bceb92facf1c5db4752099616fe99e732c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/452] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 4a9d22154b71f59958cf5ef4e4756ca38be1f88b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/452] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From d1b94540ff0b5c075db5c0624971c069f643fa03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/452] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 6a7b7b631f0cd6727cab4c488a2daf1ac92c46e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/452] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 980098d1327012dba7f697c2708830b8b5e108b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/452] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From e57e8d089bb33167ea0a958d49cd0344293c10ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/452] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From a75e6426acdba61e1f052aacfdfa0f754d6ee799 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/452] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From dfde6c29a7d16b1760c1325b5c3886796f490b19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/452] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From e3d70f30f83d0002719a01f55bf2ceb14206c5b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/452] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 07a4fc549ba9fada48832beea98f26aeb0f60b18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/452] qingy: rebuild against OpenSSL

---
 srcpkgs/qingy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
  $(vopt_enable pam) $(vopt_enable x11 x-support)"

From 5fa41ec7108811f85c8872aaf1d2814cc965c277 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/452] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From f78c934976c20c495e02a358f131c47f51a3da27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/452] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From 9a311c0449fa71196581957ed19db53371145898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/452] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 0913ac7d6edc995c90d8c1c5f3bca3078149dd1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/452] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 8cea4796f3657a0f15d5fce49401e3cce40ebf03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/452] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 2dcae8ae6b742e46f27a858c3a4c08a06cf720fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/452] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From faebeeb4d47772869e31f7c3df371edbeb202983 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/452] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From d56af2d3eb473c63deca779ee754d237ea9023d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/452] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 7be2872f281e59017a8f84562f9c9109b50687ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/452] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From e62b637b4023b1481d5684276ca937f4f0740b03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/452] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 3c33fc5643231e71a352a6ccd6cbccb286996533 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/452] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 0595d970844f2aa9f75cd0a90552436a43c362d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/452] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 66b69c432509ceff7ad9beb9376820baee72fbaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/452] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From fc1af614a8be6ff394ea11aca1d50719129f9963 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/452] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From fd5d4b9abb99369da1f0c04265947407ba3b1e89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/452] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 536c0e34b6e1f7e7ef105ad33b593a74c8887c3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/452] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From a0751871503ce5eaa91a5213e38fd95ca6f0c4f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/452] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From a064fdee8302e752287992342b4bf4b145e023f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/452] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 64d47694a6da140a6129d7122b5d8f51e93f47e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/452] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 36e38d7604617fae9958f609ebc2c794f6f3023c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/452] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 0b7acbe238ec700411ba5cd9c7fc5b785533dd39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/452] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 146c4d1598615122100dc62f2d7e6ee1c379a11b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/452] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 76a704b32eee885296b98cb90ca23383c4028603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/452] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 8a74579d7d970a433e5b22432a4c62c42bd45db7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/452] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 612cb8a518169d64df3709e813976e78c0840428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/452] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 544709b934a068491991b2d75c984f62d78e9ccb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/452] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From d9025c260f89636b26bfc1fdbafe1896f5ac5952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/452] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 0f0c9ecc665b906fa0d907b604e842dd11aa96d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/452] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b7153b2c5d0a203d179619fe831cb69975fcc404 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/452] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 7374b4cd89d1e7015ef306329198dfeb1a5ad712 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/452] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From c4914dda7d88adc0dc5a5e72b21cb1289e2bc0c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/452] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From fe19220aa5a02e3f5e1bcfedd0e00363802fde8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/452] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2816a6a89e51c53820f8271d75db28c67d38ca59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/452] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 6e8c28fe45cfb6fb249da54b223a2c6a91413506 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/452] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From ef9192a50b847238dfc71707ee52e1ec8e8ec929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/452] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From e6e2cf336479331ce0357f2a9cc3bad86cf4b69d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/452] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 2a44739e7a394c9224a7201155a65ed9f1f64e89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/452] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 816a987368c0d273d174dab2b4b5ba1b7f257155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/452] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 06c1416f100dfbb2671881d1a951b3ee89d41a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/452] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 0b7b86d94187ff882d7502d7a6f19c77e53a6407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/452] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 147a696f628c2a353e53d37d5c6342c6e03618e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/452] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6a9b8432309b37c9b85af5521c1192aec667c999 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/452] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 983439ae8015cb142d8f32bff855f5a533ca7836 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/452] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 830f964debd8f82734b61794a2e92ea488aa2696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/452] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From c8cd00d98e4f841e33d0c2a21c0b6cceaae20518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/452] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From e842598afeff6b50c9868b5f64bd128a4f650a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/452] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 2d6df0451119cb756f43e2a532ab47d4404b8d7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/452] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 57ef97d075084562a3bf404cdc3bf94b66163d69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/452] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6cc6e2a6fc9c7f407719dc8101dbb01c4660e1c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/452] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 48fde117f2b1c23563c430791bb12fbc0d4ffce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/452] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From ee21e6becd37dbd0a0e13917bb214f338563722e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/452] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From e216b2dcef94570a81e571e3281607932321e176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/452] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 9066d764e6c33aef098f55012b9f21926a6f89d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/452] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 34c8571dc85696292e7c885f5435c6eb3b8b15a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/452] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b063aa3a3dc63164971ec67430aefbc176ffc6b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/452] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From d273eed18fff61c59d2417391fb4645e2e04c9a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/452] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c742e9a2b5304a0f871784e44dec7ae06958aab5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/452] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f84a12125383e78911499ff640aba09e30b81ca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/452] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 59cde3cdf048caf0a15a156de05634eb633d3bf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/452] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 5ea52a1736b073a682bb3e129f7205818d52c5b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/452] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From e7ed184f3ab70aa133ac7b1ee80fab482d8f559b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/452] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From d1c0c2a6f2dfbb6b4dfcbd202b0195643ee70d69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/452] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From d353d44dbfc63c1bb8d09ae8cb97928d28ecba0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/452] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 3f1e2e25e39c6591ab1fb45cd731d38b52cd2da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/452] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 7789e5cb8e227f8e6dd3ad0c072b26f8ba7ceea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/452] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From a3dcc5e7b3be86fb1fb2719cb39f260765613769 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/452] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6edea959d6be8da903dcfd7bcb4e0f1e95e4f235 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/452] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 866ba09c4901d99023b4b55edd76147ac5d77955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/452] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 10318d0e097126e7b5e5b95d2435afeb0cf22f84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/452] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 8898c13cbe9c3414f2e22df907504847ce778e37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/452] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 10f61af49b7e59fd41d9e70c23e4bb59ade1847b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/452] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 3a2746952a8c1b7f4f196b92fe20804dbdb81fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/452] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 08f061ba738a218a6132038cd52a423bd145c696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/452] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From df767f715aacb968c26247ad33b4ad275bd7e891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/452] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From a4f2c2ac32a1fc62054ef7106910d8bbeb5d6750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/452] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From eaf4100f32c7af1eb1d556c6939ff393cbc5f7ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/452] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 5160d46b03874f635aa94167cf8b50e193f72e40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/452] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 9001a8f8e0cf45fbe5b4b0dcd735204b7946fec2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/452] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 6db3c1100abc3ba708cfabbe81343517be43042e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/452] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 1497356994894f325d07757d97d997b9dd183b27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/452] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 30fbcb339d3134af7f3dde596dd2b833882eea48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/452] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 569b011b76b79a0a9eb1a7b9c49b6cbfcb47c00d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/452] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 70537f271bd8e6ff64ca5ee954d206f4aedcd53f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/452] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 68af529385ed0f018f70cfd47ffe5b855e04c1ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/452] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 7f2451b367af25c9bd76c1742ee5892dbdc2e44d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/452] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 81f573fdf76ed45febb1dfdbee7cd509cf071e00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/452] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4ca21db87114bc6a609366273ef05670ded94058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/452] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 57c064c0fd9acc07ad1fe9260a6c1afd18eba777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/452] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 7d58fa06cecec8202cd44f7cee74129359cdfce2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/452] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 609962432d4cfb8ea8498b96571722341e5f446b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/452] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 79fb250dc68dbcb0c6640e330f8622b2896a87b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/452] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 8791cd50418a9c22f584e9c15ac481aab89e71df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/452] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 018e383081d83355d8d466baed8662198371422e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/452] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 5e14369d4028b4674df35a96b481fc31e30d2b68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/452] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7f67538159dd3219bf7eea56a1a3d37d035e3391 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/452] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From a9c07de094f3e1c766cbd214d2abd432b8407b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/452] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 8b67fc0cf19edd3cb4a8740036128197a77eaaaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 359/452] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From eabbdcb4e57c279ff6ef9c56c43c3baffddef13c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 360/452] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9e13632b2ecb7192cab2706040c3c0fb14dbab43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 361/452] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From a1c8e7a59b1cf521568a6fc5362d275a615a7581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 362/452] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 0f272abc805c502bcdf49791c8e12aa16f899183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 363/452] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From b3e06b87990f46092448dda9e3fbe3ad9d5f6fae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 364/452] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 2343c4d2170f9d33076da9d15f9a1df4a522ab57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 365/452] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 13a3f4b3d0ea3342e47cd70fc48a32e891939b51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 366/452] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From fed4ce3cca6777717534bf52748c309a50e893a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/452] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From fcad5380e12b89639dc2c5cb29f2f1e63f273699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 368/452] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 3349383b13d86158e7a6330ad8030f69c68ad699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 369/452] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From fdce6386a466745c6cc4e11717e3a27e950b80ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 370/452] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From da505f8b284d8d450fe6d6ba790504d13ea4573e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 371/452] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 28bc889bc2b5204bba1e26fe3301b0c48233a1cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 372/452] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From d92b1ce2fdc7c1483c5281d3069e090f044de206 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/452] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 1d3eaca02265e8053253f8eed82246d9ae6983ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 374/452] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 1c915a2e7d2f51f280c1f16e753177fdd14b2d2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/452] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 81d3aae07bd01f964afd26a55953dd6ccbe20682 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 376/452] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From c899e3d2a7ef7cc5a795d17177791cdeeb65aa71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 377/452] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From a0038b7b98534cb98448e9f6b4be66141946088c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 378/452] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 379065f297471ccd48c075482860b933a963f1da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 379/452] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 35e0f2edd448dd0407c7b5253cac6583ce8fba18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 380/452] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4a44804f6a4877ae4fbd591beac2e9e4cc7e4a11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/452] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From bd69e7f121fb318cd113363825c843b278af7123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 382/452] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From dfe9071adfa1130407996f6e98af4f50867d347a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 383/452] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From d66f15953c45b5290d7c239ac3ee53b88b4aeb82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 384/452] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From ea194071cbdc406040488623493310098e7e985a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 385/452] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 5d018dc83e6bc0ff4f1124bd32a27ec4216688f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 386/452] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 6f0ae4a320dcf22587ae38be442523d073ff08bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 387/452] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 1a3e7be7785c8f5dea22814ba352e77a4102bbaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 388/452] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From b2e4780ae73d68e325bd4884aff710eec56e4ab4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 389/452] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7dd76cb2b654a90b33abac6fb012c6815dfa8af4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 390/452] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 8056608cec75c1d9c0bf10e65cdec41bcf7647fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 391/452] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 8a0a1ca803368beb994eba2dc9a22063a8a5d06c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 392/452] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From a6614c4668c74862c89ed1d49f9eaed8f5cf14d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 393/452] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From ea7b7d98dc375f607aa64d42e9e8f7f10430eba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 394/452] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 954c86bfcbb17aae610fc29105f5c73013da188c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 395/452] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 81dd81eb7f5af3e15b4681b6bb8d1448f33b2b6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 396/452] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 3f766483b2e0af62e3e636bd7dfcef313f62842a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 397/452] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From e84387e350e0ba85f2f043fca9d42719a5891fd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 398/452] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From d038abbc82dc9fbd5cf9bf52f6ad6e266c3901f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 399/452] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From cef61e64a0894ceeca4cc73bbef9ab01dd185ada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 400/452] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 77193e017d2dfe313e13ed662d4a4fa15c04ec31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 401/452] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 3d4e4319e86f1018af77f631e63fcc1e3bdf5ddb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 402/452] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From e22d3349d618595b7c0af4f11d1706ca827c8a0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 403/452] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From a5894645bfb4973d950e7a87bcc024ee0e5dd334 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 404/452] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From cf8a3a5d59b2035848e2a3935b7f07db5b577d17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 405/452] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From d9d3996d8c6f2901c1053301a6fbdaadb1c3c222 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 406/452] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1e6ec0bb874e084c87d5fa42bdbcca35bb93745e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 407/452] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From a6e2b458316430e542d27a2a80313b60ca6a37c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 408/452] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c449528bf399b9281683d3545c07952786a48840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 409/452] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 8f043450023cff7492aeca59e4e7e6ad161b09ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 410/452] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 464387b456e004785c92707baf041646e3d1d55e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 411/452] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 36041b6b6269560b63c1e22d02d83fff047852ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 412/452] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f58e0200c53b3eeb26def34d036d4236642e13c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 413/452] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From fec70af4034c527ba9ef1c3eedf63f38a4459386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 414/452] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From d76e51ec45af702f217ccc6e8d21e3b968c38910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 415/452] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 09d12d45b486613a08b218cb8a3f201f30189adf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 416/452] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 5ee1806d343b5f407990c1b01703ecabc4d3eae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 417/452] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From bb843932f625a7b7d21957acb60cb2f5f9d470e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 418/452] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 868bec1eff2bd3bd7d80b52f4d149d14026547bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 419/452] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 1840a0f6a2522dc3ffdbb092bc08e040def9a824 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 420/452] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 52f1fac836f77f7d6addc3a88796ec86191180a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 421/452] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 70cf5885a01c5fea3bbc0d02248356cab0950c2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 422/452] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 3df8b6f86725b01204b25a91bbf1f238bfa98fcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 423/452] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From f5caf5050971a0501b097b16574aa853e70f63a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 424/452] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 9cea9685d19aecf21eb6933d7b19ef5bc2b5cd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 425/452] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From b4f33429cbd372460afe9c07ae5ffb5504a59db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 426/452] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From ca732607adef6891303c2403d82257b472a709a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 427/452] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From f513d4bbb75ae77b70ac60eca9679fd63653da63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 428/452] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From a8603efa9793c38dd4e1493bb70356f5fc577e5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 429/452] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 39e675bc7e5363d6357a326011186ea77e91efc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 430/452] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 395552218ddab3209055fc692845d73394b42ad0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 431/452] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 74a0d1529ea6c51394d2f15e0757689196b5b1c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 432/452] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 3165a3e30697c206107d6d5da785b40b2631db1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 433/452] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 6a773f14708f46bb50204e2dca9767642d4789d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 434/452] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From b9dfc804a1a7ea2c8e298daa1e3695938f8ba0a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 435/452] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 9ee55a589933a0fb045c4691ac0d23f59af980a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 436/452] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 8c7ec39442f60a445f6d4cf213e2ef9a2da845dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 437/452] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From b9dbe6723187b894bf8641b90e7e355d62eab339 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 438/452] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 34715272d43a174b31e005c72690eaba844eda3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 439/452] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 60f20c7c0b16712cdf756692f534cbc5fd0e6cb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 440/452] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 0c27a9a18478dcca8258592c2bac1e3dbdfad0f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 441/452] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d6e14dae9962816274a315fd24535eb0dc361ae7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 442/452] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 4cfab05073b308374c3191c959ff63dd65eeadbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 443/452] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 8492121f0dedc13b4221b87fadb67e837ee855b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 444/452] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From da8d88bab20c4b3fa7d16cb38a26871df9f56444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/452] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7a..87491d9fbba 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 1026ab15006cd46155cb7bd4b973fc8d5988ee9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/452] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 47d3052810461542b038def5850c045f152eb144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/452] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f..ee751c6216f 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From b1678e82599c8962006ce0a0539432f8a4446540 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 448/452] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From ecc4ddbd67f18b009b2e752a3abab76891e0038e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 449/452] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From 2e9f8830acea254bab1067adb97f3a7a6ed80c1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 450/452] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 7c75387594a43138465fb485ee761e56219c7867 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 451/452] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  3 ++-
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6be7dcd6f18..875f1c40237 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=26
+revision=27
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -218,6 +218,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

From f2ee61029d15c71e79ba1275e3f17f27d5e13d2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 15:42:01 +0100
Subject: [PATCH 452/452] mesa: fix patch

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
index 8228101b2e1..20b4bc23e94 100644
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -1,33 +1,34 @@
-See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
-
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h,
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ -	2021-02-14 14:36:02.838935228 +0100
+@@ -42,8 +42,8 @@
+ )
+ 
+ libintel_common = static_library(
+-  ['intel_common', genX_xml_h],
+-  files_libintel_common,
++  'intel_common',
++  [files_libintel_common, genX_xml_h, sha1_h],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
    c_args : [no_override_init_args],
+   gnu_symbol_visibility : 'hidden',
 --- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
++++ -	2021-02-14 14:36:36.898986675 +0100
 @@ -57,7 +57,7 @@
  
  liblavapipe_st = static_library(
    'lavapipe_st',
 -  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
    link_with : [ libvulkan_wsi ],
    c_args : [ lvp_flags ],
    gnu_symbol_visibility : 'hidden',
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
-@@ -39,6 +39,7 @@
-   'gen_sample_positions.h',
-   'gen_uuid.c',
-   'gen_uuid.h',
-+  sha1_h,
- )
- 
- libintel_common = static_library(
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ -	2021-02-14 14:37:08.623233120 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 553926 bytes --]

From 1b534f38129ab3209e5d74057c64c8a688f646c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/452] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c..099944ba555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 243ed4a0664c5c8a3aa9133ea526b16567d90c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/452] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 80afba7a8d2d0227466975e2000f43d0c84a3fba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/452] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From fae74dc9d9d5dc90f7ec392ab4bb4f8ba9595643 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/452] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 8164b25acd6d57bf8d51987e6c02260cfdfcff04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/452] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b5fb5604f0acf71510beb92c7f7d9e7fd8bb719c Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/452] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 099944ba555..3b84249d9c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 485db5eb72a318589f2d64d11285c77d27150e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/452] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 248f82ad30af46b0eb6ee473224b4cf24d59c0ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/452] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 37a83f445224ed2e8e237ea573f080eac86d3946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/452] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 3090bb8eb512da12704b379e4e4aacd83c2423fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/452] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From b3abeafeef785890a9356ff4a071fd618c4e5066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/452] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 2d794643a1bf1f504fc15b35c427e99f3b34e229 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/452] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 55b89df9fb9c8d684adec4e11c6865181d4fa0f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/452] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 49d0b76a9d2369904781a5d60946d43de48a7da9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/452] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 42ce8f17bf39f9223f966b31ef01abf0b6b7166e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/452] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 1f013c1c34ae1f518cb65eee968f1eeae22deae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/452] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From fc3dabe2afc99eab25e4e1b786659096a3359929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/452] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 7fc1ef4a1d9af5d357bdb060b4a48ea13eb7ce7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/452] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From ee64f6906e711ffaa0f7312bad994b7a002d1f10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/452] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a2a68abac95788b177ced2876012006efd6bcd56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/452] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 48d4c5a5b2fe683e11e945d23d201ddfa23688e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/452] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 72b5427fc9d4a301d4e67d16cc7d9968d8d64a12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/452] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5db707c13e3f39ba72c7a10ced9a620e95aea325 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/452] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 9e982ed670bacec276fb2091320e4f7046d78a0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/452] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0b9eb75760dd45486fc2dc0131feb9431dfc40d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/452] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 66f5e662e92caa45bd0fb81998c70e3bf7d36f77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/452] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From d25fe08e5555ae2bf827bdef4867bae7c382adee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/452] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From d8154a60ce71a919478f30ca8217e20f8d85b2c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/452] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 4b6a3b61739c4360d5adfd2c226256808a7272a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/452] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 59a48f48cbd2090631a4c3722f736937dc7a790a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/452] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From f6cb5ed3b4aa90fd611e210f49749d133f3da680 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/452] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 599c3815d3822cb2eeca53cbfea030e4b70126a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/452] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 9f2e3891d0bea77bd604f8abf053c5499a72a48b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/452] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From c3ad1ac68767b7b940b0ffdd32767a05c3519092 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/452] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From e5c1a8ed3ec45b4fce838f54fa371147c3ac4236 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/452] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From a522ed372144b0cdf105f375dd5136b3ab6a7039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/452] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 8b68a861f92006af4d501e6fa5998e03510e7ae3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/452] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 3946d71a60a46b514b072683980d51301304639d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/452] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 15d45ce10b9ba2dc7a95ba8b5f16672ef1f12647 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/452] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1465273dba905e4673fca81c207d5f49505881d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/452] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From b78154431b56d7754e34442b9e11517161415dd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/452] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6b08d038f958541fb52074aa0dfdfad6f861e7f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/452] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b81fd2b13e0964b3c6f7721980a912d50775b7e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/452] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d2345f17decda35e203787dc090ea5cdd9cdb41f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/452] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 1c7413671e33a374c01895a661cbbb2e2fd91986 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/452] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 07a25ad958fe640012b45fc11fdb12dec97377a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/452] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From d3ee47ee55359942b93f2c2d466f921c59d52453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/452] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From d4f642dbde08c0cbad94d783fa93a53a79e66412 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/452] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From a8059436a8b41035f9cc3bedf9ddfa6f497f7df0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/452] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 7139cd67f64fc89c7438a1898072a0211f578ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/452] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 4f5a2ae6cf151507923b3315d09fd4270077e9ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/452] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 6c2321e4b2ae91a168bf772a235eae6e1ecabd09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/452] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From df2d9562b6b69f8bb9676ef1a3cef169755252c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/452] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 253c93755edf70bd28e20945e3925bce1664ef0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/452] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From f4e33186db7ca5c9965ad19e3a4e52510b617e0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/452] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From e5071bf63ef04f477bc424f24b7127cd4455592d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/452] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 75b5644e255a0ae063f0b3f2e39f3674d377a825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/452] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 658f66e23d2efc43e310bf61db29aaf0515f41cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/452] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From bcfb51ccd6dcb33cde5d6b83f3162e40b2d1b59a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/452] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 8aa777514124acbe19f75831f483bbdd47b690bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/452] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 531ebc037bcca33de5339b5af2b607904d2279af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/452] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 0a8fc4bc249d999db02b9a7f07a66a084c53b624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/452] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 1a0838544f62afcf95c799c9ade626dfcd35fef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/452] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From e5af7855a58083c9586f9b1424242a46f22b0b2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/452] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 752d0b65534a699683ee7c2031e56f15fff7adf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/452] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From ba0bc3571b65673ef5feba212b03426e9d306b42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/452] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 2c8ebaca00461e554c415c88fec34fd6f0a487e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/452] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From dbe2c5efdc20ed296dd302fb03a8a86ffbd9c1c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/452] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 5ca091bf70912df848f83968847a48d7bcf1f42e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/452] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 94cbf8ac922c9755abf0404c9ae3b2c32dd6ad0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/452] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 25a0c4a646b1c331f4da5297f62c871d3491b3d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/452] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 05b547e60e46b53ee8a022e3e4507537f3359251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/452] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From e71276dfd6c675a9ade39a12036851df166dba15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/452] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From bb6483e11c832d66db2fecb31fd6ee1b7c90caba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/452] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 8a1ec54b88c9eb0cf2b10a8d1788ce9f40f73af3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/452] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 4214ea361b09e36f6e57e53af338a5d14b2078c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/452] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 358df771f2e8c1a8ec2761e730fb930b429c16da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/452] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From bafbec7855cdd047c6f439cfbeff33c0741b9de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/452] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 92501ed45ca421897cbcf3700d25a240474e690c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/452] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 83409582767d23b002a7f1b8fdcc79e21d0660db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/452] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From cc367cd7b494d9d850a812f5ce8d44a24867f65a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/452] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 905987d8f3568ddacba8598756bbf5e90cfd1feb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/452] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 713fc80ed14cdad38912c85d1543eb742244a2f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/452] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 2f1c88c87e3b1402c81b058aeb7ad8e71d26bde7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/452] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 5b81cbdec90dd425f16501cb7cc6fe4e82b522f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/452] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 1c198dbf44fff5d68150f193c4d17b80418a57ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/452] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From af88647271d8fed668d573c477bb28a22659c30e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/452] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 050064f86371b5794d06d9bfd73e9693c9a74a79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/452] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 3d7d38054ce6a2203430e158c3239f6e68da4b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/452] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 25f70270763ba3b5e0369f9bf91d9fa0564fcd33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/452] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From a185ce6d0edae9dcc69c3b26500ffd70f4fe2ca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/452] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 77a99951e5d1677f579f3ccc6a9deaa645d20bfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/452] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 61470bb1fc849ccb1632b9897100afc4bd47f770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/452] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From f30ad7893126342476d3ddde27a32c49da0aa8f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/452] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From aa6896a90d6952e43b1de1de36c35e5b8746fb14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/452] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 71684dad22fa881505902c6f2a775612ad971058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/452] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 2ad35faf7e08a4e97efc9f88ec402d89fa5802da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/452] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 8771c4c47fdc9fb05c0a9eb5c24969c2dd5c1bcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/452] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 28fbcba8943db4bf92aac8232867799b0a477115 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/452] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From fb016cf1f5130eb0788506d23495fecdeb056ce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/452] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4896fdfac44cd1253d330c461099705a47b66fbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/452] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 4d5a89daa060982a782e998ef8e6d0cc0027f566 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/452] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From c5d0f0441321a10c1fcd479711f6bca75a17daa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/452] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From bd34ebe1ba192e57e81f9f0730c0c6929a783537 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/452] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From e03a9c9b85a86267f28fc56c67a399cb6b54cdbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/452] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a90ab22c47dbb2203592028b07d0f52600de70ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/452] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 9c312a45f5c63a5adb05b07a564ba152e2f781b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/452] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 5bf05b08c0cc7bfd2585d1e59c144d1daf466e1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/452] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 44b1d01a893121c144a1ad70c4f4454a5f8460ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/452] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 73d2e0873ee82a80815ae42b0134061e37fdbba2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/452] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 51372f4df29ea50ce3c56d0299af74c05611a255 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/452] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 94083849017dde0ff647d0274c1e94378042f475 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/452] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From e7e5e1f40188c1cbe8a8eec0fb2464ff4b5d9d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/452] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 09ffe73002c0ac1b746439b0aff18bccdbc6cf8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/452] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 810094ed9c906789a13d5d48f71ef505ee808e19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/452] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From a388fe6ba46b2db5cfc66a7a59b4f46ddcaf1b22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/452] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From eaefad7f3bf347efe1f8f3f2a7dee7b7a5805a5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/452] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From be9ae95ffbad142719c20f2befc3771fc5418b68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/452] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 32b3d07269a3a8803b3fa481e24b980c8f6087f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/452] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e39d6dc7241bc1f009637464465468f367ce7d17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/452] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From cc3f62138f69f2661c90c0da2f663d7457246d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/452] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 340f14547ac9e03875188e0da03ae09857ebed01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/452] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ab6d51766712dd664a6b82e1df49d51b81756857 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/452] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 4743d75db3f3f07360b54319fd7e8b6b3fae26f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/452] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From ec8fa3fa3dc71597205a9d52430e4a9d16c374e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/452] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 69ef2c2152a27eaa7ff4b32f7e41c64674b46b11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/452] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From b43027a8934cf5bf1b49c4224523f964edffcb34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/452] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From f871d6e3c44f8ac73abd932c42830a44104f5c5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/452] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6d441512b51f3a8c2e06276388db4e69b6a358e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/452] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 2909733b01b612d2c6ffbefcf89a7b2ccb222819 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/452] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e507ec08d95cc48cd4a4d6706f898bc49ce13632 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/452] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 4153c82bb8035028084739d125f5ab6053652ca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/452] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From df5f6bffdeb33ff6ee9c2261e41063cebd9ce3f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/452] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 84cb7b8c5c127e08060d6ebfd72ce083ab9b6176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/452] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b424121de50af4b7b7f7157a7484a147a65c4d3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/452] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a5c78e92905ded352b62f40a7f9f22b6abddaf90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/452] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 6d7fcc445241f60145c7ee189b4f1fb3641defe4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/452] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 6fc3203c06ddb5b95cd7846cc2f467b00dd591a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/452] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From e5c3fcc938f7bdd7d0a89ce5b1481a1d66ef9403 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/452] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e51ad7a0bb084d67de00265559d8e435da7a6443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/452] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 8509bddd0a7c07748081481b088f53663416e339 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/452] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 03ff000c1799fdd317455a282caadc6695e08f2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/452] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 28d2ef1acce202e67945c4c9bd008c7ee66dd8b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/452] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 995e472c450fe523651d837238c0be0be3d0cedf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/452] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 28d83883b9acca92eeed1e80f5e7917688a847ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/452] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 728d87f74cfcfaeec109bde80f9fd2bb37b4baae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/452] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 01372192399a5dd3158d0c0d07c3525df6d29ba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/452] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From bededdf70590b24d564e7c175adbd639278bdfcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/452] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 20ce1bcc6d4c261142bbe3355d0c92e1c7ca209e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/452] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 866ef2c459eebe0bc4b41ed315a9d57850348d11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/452] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From cedb8138272c818e44b22efc677946cdc24b2d93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/452] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From b7f3706de37c523ff2a43c0667a18e85694c48ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/452] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cfee703fc6f4f1d67547e8621fedc3383697822f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/452] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 45f606e05068a33233fa9f7ff7875a59ce1e9fa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/452] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 6423a565d0dca75658d378457e2d8c640e2c2e06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/452] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From e4647a76a682cc1fd75ba89fa59e481aa9c241b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/452] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 951cc9dd870da3a0998c8987d7137fe8f6db7c5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/452] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 30d1bd277adb4d9d7f345a63a559c8339331d46b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/452] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From b65e9237fc1a0c22b4c3489c24f9cc5409f3dbd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/452] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From f9fd2349e451ef39cf3e8f7eb1685e389367fccd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/452] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 7eb2b6ea59c3e376b71a6b41b66abec5ed8b5608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/452] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b48892d10bc90657f3da82528c5bd58e3a7f8603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/452] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 303aec3b78535a87d959db583cd18d49468cf181 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/452] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f52622fe9731cfa4f4803a3d2a70f6d06f4375c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/452] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e42fbdb604ae8df096e98ce4e0aa746a804d66fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/452] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 04041a2f308fb6ea1021a2bcf59153598511f0c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/452] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 80f0c5105518eceaacab3dc5bf6a3e88ad4d15cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/452] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From ff8650a297663d11dbb941708edf2303028c1c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/452] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 82fc2e9694781cc326eaa00208ab6ba48817823f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/452] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4988518d9b8b5e37fbd4af8019d1bf2c664d53e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/452] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From a4908135c41938c2c38a4a74fee1a68bed6fbf5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/452] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 467a4084790c8f45ab130d7e29ca06d65eeddd5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/452] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From f662a3a9278f633938905dc9700fc716200f4159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/452] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 4d91278de6159c5624c00877a155d9e5f4c46d25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/452] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 44103d6024d779d805e5739611e1448fac628535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/452] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From b0d01de5cdd9d2921f5a359a0cb039e393a4d6e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/452] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From ab57d32b449e7055b903f9d4b7201a042fed24fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/452] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 3d77a46e8401bb434343acdcf405835d16cb2dbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/452] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 0787f1eb648a27d5a854ad16a22062f1b79e476d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/452] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From a1949cfa5699c878d9233f7921a3849dafd9b873 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/452] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 1234a16b701fc8f85663c4cd18de9454b66ca819 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/452] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 96f332177a183885f852470ff390808956972023 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/452] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 4f5c7c973d1bd3a4b3b01d25b372f33e808f9056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/452] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 030aa1a94b1e822f8af10b9281608644384020dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/452] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From c7a3803f2160abf2a061c2d01d723480c5751a82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/452] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 6e73dd300a455476e13d496652229f277a3db19c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/452] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From b65c056308ca358b7d833ce554ecf4c70c4c858c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/452] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c91b5a596e31cd5b518e4ff1199ac7e08bbced2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/452] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From dfc5b89c89b34094f83a8bc9d632020b4de526d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/452] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From d1c1287bf349d105c138b92394e6c7888320e36c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/452] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From e6753e7ad772235ce53f97fdb7f69120dc3994e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/452] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 5b645079a868894835c8042ac1dd13ff345dde25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/452] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From bc73539af857be3b5f0a39bdfc408fbc638d8d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/452] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 48c7ed70fe96b5359d77fc64276c797f9b66cf09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/452] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 758c728afaaf0ee3ae3bf03672699a5c8654de20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/452] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 9d15652f03fae2443043973a7f510822d28f0939 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/452] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 9ce1e422a66e1079ffe314f5818fcd69cb1a2398 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/452] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 81dd3e8f663e253c431caa4b0135c1f37fb47a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/452] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From d45f3f20a83124a4fb4e73159fd2f9b3c456abf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/452] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7787861c1f2e92cdda4fd95a67ece0d4b4c4f489 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/452] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 217eee68b6b19b28a4e3713ae9d01acd4eb55c29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/452] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 4c8a17d56354d058467808b1b17fa7f3804b8b97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/452] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From fc91945a296e610300940d9978988812f1cbc464 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/452] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 3c9c3600a6e6290e38b5171d84acecc625e7bc51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/452] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From cdae8d0500e353eaa121f192ade9d6ed4c7fcaf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/452] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 4c49b68cc020478a1a5b8da5dce1e95468169bf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/452] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 3b059c8ee7276184e2980cd3449320b48eac746c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/452] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 061be27ced66e6fba5bd87a324ea160a1470fe69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/452] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1d2398c8ed00f8f5cd2ce98fb7afefdae113bebc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/452] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 50aea5a95b80918ce51a9c60c5867c0f3e996af1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/452] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 71fe53f2339d34f9ecf53e2a10da5d2d454cae42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/452] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From eb7e16b9751b9b313dc9b14319409ab6afc210d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/452] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From d2f7673322bcf505d88766dabd4b9a29ffaaadc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/452] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 70c378aabde4bf8d2a0aac7c89848ed8f631f5a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/452] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e..b7905e70e4b 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From de5a283ffd35b5f501163e81c0290407f8db6410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/452] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From eaefd8ab60975c7d6c503059222e5c0e0f2bb608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/452] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 024aa08b1fb505ddd1d00fc204c78e9ab9257c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/452] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 67e93ef67a9ec36aa1462b888930d2fa14d724e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/452] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From cd1e2e0a1156103dc9b65665bb9837503ae6fda5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/452] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 38bdd3a83042eb92d5e756130a738377a5df30d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/452] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 0749bd2f8a56c4059b04dd702afc2d2c2bf93e40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/452] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e082994b2d5d4572856f01a763bc924afe5e46af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/452] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From e13291d5d1e09c0bcb3eb472ca10f7acd3c813fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/452] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From db6314307aecd5a4d2d5fdd2b567a459eb1f2ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/452] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 0ac4544489abaded0bd68b01db40329e6c6e69ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/452] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From d91ab71f93576bb622ddc43faf24060efcd25d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/452] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 8a039780f04a3961331dbe7fca8e705253bacf17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/452] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a03d1e10d06824d6dcbacac7e6feaed81ef286d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/452] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From ecb3806f29cc25a80a11d17b1a47198a82bb241b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/452] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From a59f5b62d607a7c0ec7baa8577827500e682a2c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/452] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 2a4a231dd570bda45242eb057e172570a0fcbf55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/452] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From e9ececf76f4844b04de74ad90e768dc0ecd7e38f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/452] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From cf32ba18033c4dd1a9a432816f39a14ec672a1e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/452] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 60a642de2d6d43df31b17ef3d0e3f50cdd4c359b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/452] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 62d989c824693d20663b62c5240441c148190f34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/452] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From e79548afad047741cc5c8e9b21492a611e3a9948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/452] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From b10fa2c83e3fce414a8c1c0c8f592010e652b28b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/452] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From c6d3f5e32ec2ee8267d1822429625b44854f3ab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/452] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From a5d61a39fa811f0bfb8230840c6f761b70fdc80d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/452] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 02b586f781bf009b34e1b0eef9f112f74c2272f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/452] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.80
-revision=9
+revision=10
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 52df83a9535afb2a890abcf92a88f59e821b1155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/452] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From da82043aaf445655d7fb08d5e026896b3e9aaff6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/452] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 91a4494eddb8692ed11b6640546755144e7cab54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/452] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From baffbbc986613c95242534b9835540268d84e1ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/452] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 2b2279a6aa32b755b68fe3f682d5d10f5c6c929f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/452] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From c45d74ec64f4913bf7b9fb989b045fb848f9c4fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/452] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From f27f85ac071fbbb51508d1e0c8e19c654da94b28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/452] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From fc8d406fa1d1dae9d7aa42655042bf86894b8f26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/452] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 8345579a1cde5eb8dd8ce076d98cf2ad2f14e235 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/452] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From e492abdf4c4b9a98eb031bcd1e98732756fad718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/452] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c5746c0a64ffdad8e9cee5a8883ca0f1f3f81ef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/452] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 4828b23341264c44728f4f7836c0604e61d1b8ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/452] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From e1f4f20c026ad6aba264c03ac3e9391e13a232b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/452] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 26b66b94c29e6e1d0dd41a8137b35dd6ff470e7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/452] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 23654a6c6bfc1ea20b12018e6c609288ad7a4315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/452] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 5dd16d418cacddc67b53451f7641cf199bdeb813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/452] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac0950cd840a886b2235bdd6f24ff3a979607b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/452] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From dd25c97cdde0736de97aa775dfcafa0f75cc8509 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/452] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From e9b5115dc308b424064011027f8cb7cf6aed0f97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/452] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From aedba3ad21d305b9fe1032207eae9a60aebac0b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/452] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From c41c15e6e15a7855535dbcea628fd4d39582043d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/452] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 660e0b019742633a690dd7b21013cb4d741ed28d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/452] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From c2c2f0be16a5e7ad05d05d822a6e17bc257c5a6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/452] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 4e471ccf5ca135df3dd1c4b38496fabb0297626c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/452] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From 3cde166f78a35f69d5063efcd8e81aff9e9d8974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/452] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From e9fb26a49ab70d64f5476800b0fb84783b129da3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/452] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From a0f6cde9fbcd70d3cead468fa124f021cd25bc4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/452] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From b89d5b2b874be1f90c569d55407ea11f6d91c8ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/452] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From a2c01ae149461ea680c5954947d53e943772d0dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/452] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 066d230596968bd7d6a13c0d36c4761bb56fb77c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/452] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 492b672fdfd6e3f1260f4abe0930bb806e6f2783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/452] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From e9ee23ddd9f853d5c813bc1518b7a6583f25afab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/452] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 447986677163498eabe2107c7733ff059e99f7d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/452] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 381a18234925dffee40b4c6fcee12e3aaf100314 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/452] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 098ea283f07d59aa6cb6635aca62cc28e840d546 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/452] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 115570c52065dacbdef2c7b5450bc39e9de6ccc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/452] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 2604b822113af18d01d3b9ad824b78f59cfceed6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/452] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From a281845b06dd694cc2a665bcdc68609800cc138d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/452] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 4937a60cd8e35076921b23c1f03944b6336fbcdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/452] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From b56cb2ad2bef753ee1818302bfec5efb9768ab6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/452] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From a69864bb153fc65bbe38186bec9885f323a59b27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/452] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 90489bf8d8a873e476ae018e6c22eb4ea0a4057c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/452] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 56385d25597ee760cfd5d5a854d8b4718692181e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/452] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 4779e9e3143567fe755daa2d0c14a3bf66ed755c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/452] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 6a4dadac84c17c01f6a1a0f3ded2d5e785082fb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/452] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 24c34733dcaaef12259218ce9ecfd7d85a10e001 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/452] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 6408ceb5b5c9d8d164b75b83a19f5530bd502bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/452] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 09ad3e3e16a38c31a7a7cf783b5a4abe2336d963 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/452] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 612e93a0edbeed0d794edce50610cf7f9882200b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/452] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From f15ef859b728932b4006dadc409f023f8ca39acc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/452] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From f16b78fcc337e9d2905355db74b2825590ea8a05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/452] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From e9e7bc4c7d5ee8ac9055d9f937396fbcc9f307a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/452] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 271bc0c7df41063b1e887d2502a4408836d8ecc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/452] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 067e2e428aa6578e4eb1e8213851173c8bee3ad9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/452] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 080d9eed6704832dc4c6df07c6fa321031d861c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/452] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From f8f0e43b98ed75c09640ce421deaf525cc0a8c61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/452] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 2d77a6a7531dbe2543d190f5e83eddb59ca899da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/452] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 7e857885f582dba10a33dbd07a7ecfab2a374b86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/452] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 63dbed8e5b567d0d7a11633c2c3ea7e39ba305f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/452] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From aaf41bb68b8475c981baaadb21db3175d72a33a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/452] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From ebd67b3be865507e74ffccf56e1b2a0e3f350f27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/452] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 607c7c14af5b410f71202d5d43b84f344af609c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/452] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3eb1c8f9cc73c43f200f7174645c6d134bcf9418 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/452] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a428cacf1598861afb2208429a2ea744e1dae290 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/452] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 6dbf1409d2dabbb403ed4c731ab3dab7cda5b6a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/452] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 79150be957f26373d28eb180aa7866dfb0feb374 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/452] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From ed861d9285adfab700c0bd934e254814ad0ec84a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/452] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From 5eefaba66c86dc6686505173ff50c7c13a5abf11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/452] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From b248307a15b03098cf74420e9a42347aebd6258b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/452] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 125908f1024c2fca0a89e91ed99460de720c7da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/452] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6c49da5996016a27eddad7654d6d970a9cf7e8f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/452] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 22c016a478df5335f8d15eec80d218d9ea2bb7c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/452] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From f8929416f16ca0fcefc153711bc1fd7907304d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/452] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 36b2812f6114a2e9774acda866df977a82332d52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/452] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From d7bb6de49766ae943271e1307ac2046b15d4d8c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/452] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 7f11b9b8187d75e5a55e7f0d627e0a7d436d440a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/452] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1e76e114009ad6c722deb33b55ac47cbf6e7fdd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/452] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From ff4ffce9ed46e05c2d161f284b395c58f48af877 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/452] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7e61f530cf0b47352f4731d9e7f95ade02767d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/452] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 66c5172e496198dd1d73e0bcea735d36a4f198ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/452] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3f8ff492864d30f3dd9758a935fe6f2d64e46555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/452] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 7cfc78da13eff40a77fb02a3b1257cc1178d7b94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/452] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 0911e75842773484cc3b97a013b1899a630b2f94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/452] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 9600608a36026ae960df3043994bd8f65f416e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/452] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 47d1d2865bdd08c302964a683b5b189cf4c47673 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/452] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 0d8bed14ade8d9123b14d05d7c82b4ba46c62e13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/452] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 312557abf1513f57edb4097ee3770270886a1c80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/452] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 8aee80a3c74888a7c5b8f920282b42cfb66dbcbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/452] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 12a74d80caf95c558b4a2414cc495b157ffa2f3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/452] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From a8415473dd64c063b553b08afef7ae56bb6ea508 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/452] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9c46de2ba81c65ebe73173f18e05d03efbdadb2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/452] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 70b2c326b15c637b26181bd87c20159d65c4c29e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/452] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 12c2028b49dcbc484d33330c4c3af79bafc01c29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/452] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 0e9469b2fbf1659a4522cdef68f8bd7470c30cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/452] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 7200b53a7fb2652b8d373ee91b7df033c4d41b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/452] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 9e368875bc764233698becaecfbf47ee49aa8cb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/452] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From a18223f19bb00e98953c198c1f461eff7bc5d3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/452] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 7c6962f5fe951a57b5907018345a4dbb0d277714 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/452] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From bed4708513a04aa61b46a396f845fb92584c370a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/452] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From db71d669c77562356ac6a23336747e2b994c9580 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/452] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From a2a420eec4c95a79bac36cf892931a2217ce1d90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/452] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From a651581b20fd5ca08728b079535af30a4990145a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/452] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From b3ecbd740f25d784706c2642e23a13c8cc5f4803 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/452] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 22b2a177f3fd9dca2a4c02a724a329ea3ae1bf91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/452] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From e2c6ae27cdb450a3b09059c2522dc3781875a6fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/452] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 438c541beb4d75bd154cf97f4c0bf28931a1c1b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/452] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From ff284f362305102f8b61632484286f475f35f878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/452] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From ff270a5dfc2db59bfc75981ef1cead1e6af04ece Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/452] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0f899bc0eeed08ea2ad27b859ac61ab001304446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/452] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 2abe65aa0d9e9fc520c06e2131c8caf267aaf7ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/452] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 9b168f8f3267e78ab5fecf147211fc4f7569b7f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/452] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From db6152341e997b6835878fb318ed04beed5df5f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/452] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From f934b9d3d7fc0054d6a3b891669ec77029cb49b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/452] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 70058ebfc0f8d2f75973427e3b19bb56ff02d867 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/452] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 3e5dddabddfe2e7769189e34d2a071eb6725b6ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/452] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From fa52201a4034bff5ce2f31fffd7e32185056e58e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/452] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 27c4e2795cad18b2bddb0ba708309bc086c0defa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/452] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From b6d2731836230f5904e4c6139a23135483da94c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/452] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From f5e136e8ed2dfa1d83c8dee4d9818cb4074ae2cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 359/452] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 1a2dbb6ebbb2dfab5795e735e049fc8d3ced6e66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 360/452] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 23dd694b095d2eae42383ea1ea7c3dde0b44655d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 361/452] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From b842aa28bf4ca15403351420d5d03b3b9f77bd73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 362/452] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From b341ecd1e7fa92e8bb42b45be5c1fcc6a7b93cc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 363/452] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From d4db8b92f4908b1f7f73fa47c3b3f2b1b073c7f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 364/452] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 8f2d25ffd82ee9a07d3769e986b9c9f0dd8f707f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 365/452] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7dab962c69c128d44a3ceab838de0c996699503f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 366/452] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From a7de60fbdb765af9969a96b5ddf73f9e1d456f17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/452] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From beed8a4eb1648222bf0bbf8ec00e756670d675f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 368/452] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 641914c3be63d2c89d5b883a459f34053b32a298 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 369/452] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 74ed9fa0884d51bb778f10178fee74b859c2d4b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 370/452] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 7d7abcd8f597bb4edef353b272166124b0806d95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 371/452] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From dd7b3b45b0139fb0bc5a4b127a985d7d295db342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 372/452] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From fb55a15b2921e31a080f1c00aa26ba03fb6c854c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/452] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From a1ba6fbc2f06110b26f2efee9d252b3ff71f3407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 374/452] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 6609f615229a42b2b6d3077dbd033ccc80801138 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/452] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ff343b2baf8f1d1206b49c39f08866591359dc1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 376/452] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From cb88d1a748fdfd00ae14a613bb7cf1d896f89e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 377/452] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 67d12a6197718d42fe2b646cb7a9a3b7f80d5c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 378/452] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 731b5571e12be1f52abe79c2607661271716a938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 379/452] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From f8c0b50afd2818e389ab912a0997c7082073aad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 380/452] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 65a2e9a5ddee4ba2fb151c627658b4420a8c0bdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/452] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From eed619c006c05dbb3716600e86d7441e15e8775b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 382/452] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 58d53b16badeb0b46f9bac0307e2ead01310c4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 383/452] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 0b31a71884bf55c6ed7852cdf3685773ca82d62b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 384/452] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 361f86eba52f7275abda0cec233fd2406320a33b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 385/452] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From e7fe0b335d4c51b76695ed944744cfe5fa4ee665 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 386/452] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From ce72211ad19abc989b7d4af3f5eb213ab2ea7053 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 387/452] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From c020bcc155fd9bbf8736c810909e614ab4e2701d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 388/452] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 5fec12e993f54e5acdb8a22fb1d4c3e020b80a8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 389/452] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a6ea25fc0831a9475c9e5223e607850d477d7325 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 390/452] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From d6e7d58421658473da8894e4afcff237a10e91c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 391/452] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From be77671cf77f0b4f807bc1073027cfd08e43aa96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 392/452] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 05831bdb115c76dc299da01358f40ae6a2be6bdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 393/452] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 393c48f84d9eec3cfc2d3a74276bb4b51724112e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 394/452] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From ce3f4fcd9f5b642742e92b3c589c295ff3f58a4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 395/452] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 402d70eebda0ade8920c47579ac6bd7e1d4515ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 396/452] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 24f1b2d29375b9f2fbd454b0a8744b8f0f2ec1c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 397/452] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From a0c17cf555b03e3375e0aecaf2062b7ccff687b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 398/452] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From dde02f6d4ba6cd49692ec0cfcac7e28eb9b55105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 399/452] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 4f356ef936969fd626646ac413ee4646c19b9cd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 400/452] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 2ecf1857c999b0b8c97fc08b6b0aa9b7a42c5641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 401/452] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 286834f226285e7881a5f3cdd358af0e7265ddd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 402/452] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From ca4e5c55acead170e8f36e4b0df4d23c28279509 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 403/452] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 362ddb98a7f7843c7109e4d0e86d49fee268d650 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 404/452] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From d135e62d1d901edc8e25c88b855c4859abbe3274 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 405/452] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 788d6572aa8b8d74381d22a5bc50e62f451e0c36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 406/452] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 49f69bb326af485b2a866e8a52bd73e119ae815a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 407/452] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From dc88e66768cfed974bdb362a44e1b865e78e15b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 408/452] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5061fa648cd9f41b6b2941ff3fd9f78f9f0d3b96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 409/452] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a67d14bf50977ba9480e1c06a1e0c92ef7692e3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 410/452] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 33e584e6b28ff0916aa4d790e87e403333cad90a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 411/452] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 491d5dbfd374bfaef323c64da0572fd771cf7032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 412/452] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From d4af3a7f9be3141f6577d60e8be5957876327149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 413/452] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From c5b34457c879a3fcce4084f93eab51fdeaa90fc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 414/452] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 9f6af577a25a72573defcc87a71195b509f62fd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 415/452] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 8dd7263ad7c086af9b900d4daae06f458f78c42d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 416/452] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From cd36e4275dc110b01af24bc26d1e3673cf8a5974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 417/452] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 114002d86c016cd8f92994f09a1b0dcadd5523e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 418/452] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From fe927feecb5a30a68e7d0eaa85e48d51aed76f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 419/452] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 4b25f229c67ecfa3ad9824004e96de86f6d700db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 420/452] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 2bed67aa1f2b672a6b3582704cfcf5218828cd73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 421/452] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 15ff1e7ced1eab783b9bd3bcfb291cb2569cb727 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 422/452] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 9749ae77e615417acf831147e13dec3cc7ffd9a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 423/452] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ba0aad54269dd516c5a0932705fbc31203ebf6d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 424/452] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From feb4020452659f786adf105755dbac630d83bd51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 425/452] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 2edd226a006842f4ff9f31f87755ca4e39eb6d67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 426/452] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 0637b689f6ee3324ead720217ae47f78f963823c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 427/452] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 3683346e40fa623582a06b926859ea9228a5e4f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 428/452] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b561fdfef5a045b1e9e1c259aabc111417a944e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 429/452] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 2df61d0a34ac58a3c99f1c289543f8d53b7efde9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 430/452] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ff5e8fc66091e0d03d8939a555cf4707f63cd9d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 431/452] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 25b12a0e3b155c4be6ef9f438ffc0ce2cb3c8a9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 432/452] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 6458d96533771557e04ad20860c2bcf72df1eca6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 433/452] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From d63c72b523ba1810a298a63643ba2ce644eb5543 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 434/452] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From dee137c4d6e5af17fa0351b48fb283141268c085 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 435/452] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From a2a9ab5947a25ad76e4390843bc46106f9cd1a36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 436/452] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 5aea911d70a6b310cc08cb72add9a7a69adbefc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 437/452] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From fc030fb44275f5a0aab957566784c14817db2f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 438/452] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From a9c2f3a29b80b1c8e46712ad3ce4f8f319a18866 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 439/452] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 8cd4c165541bb5a07667e8e1f966b9a824bdeb55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 440/452] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From c6892389069dd92da47aaf7a971e0b656d29cc0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 441/452] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From fb0a6b03abc8d5e6414316c347dee5b3b6cb730a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 442/452] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 193d8ed7dc34c2a680f6929811e38232834a439d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 443/452] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 4fecc915d2f41765b6a642e85c2a493dc1ec879a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 444/452] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From c280768a52fe854e794f4c9e868092a40632b4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/452] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From be9ed294e5a69565474eedc1fe55a1d0c4416bf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/452] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 7aec902ea24c8134b5fe76b5c1b398a89c54d5e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/452] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 15ad8406dec65edde5de3675202e596c7756bc63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 448/452] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From 7a22a98c364b700fe819011c9c5c2cd3edec7bfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 449/452] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From 5f42aab1bb88ea2f8063c3dbc8508fe39514f078 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 450/452] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 6217916dfc14b48c70c0d42fe04b8d36108a091f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 451/452] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  1 +
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fd0328005a5..a557ddd8e15 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -220,6 +220,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

From 715cd7bc1ceebe76bf7c2870492b65e0e894fe4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 15:42:01 +0100
Subject: [PATCH 452/452] mesa: fix patch

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
index 8228101b2e1..20b4bc23e94 100644
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -1,33 +1,34 @@
-See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
-
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h,
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ -	2021-02-14 14:36:02.838935228 +0100
+@@ -42,8 +42,8 @@
+ )
+ 
+ libintel_common = static_library(
+-  ['intel_common', genX_xml_h],
+-  files_libintel_common,
++  'intel_common',
++  [files_libintel_common, genX_xml_h, sha1_h],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
    c_args : [no_override_init_args],
+   gnu_symbol_visibility : 'hidden',
 --- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
++++ -	2021-02-14 14:36:36.898986675 +0100
 @@ -57,7 +57,7 @@
  
  liblavapipe_st = static_library(
    'lavapipe_st',
 -  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
    link_with : [ libvulkan_wsi ],
    c_args : [ lvp_flags ],
    gnu_symbol_visibility : 'hidden',
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
-@@ -39,6 +39,7 @@
-   'gen_sample_positions.h',
-   'gen_uuid.c',
-   'gen_uuid.h',
-+  sha1_h,
- )
- 
- libintel_common = static_library(
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ -	2021-02-14 14:37:08.623233120 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 552767 bytes --]

From 483ae47cb15f733eac330a6113dd800332ef7ca3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/451] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c..099944ba555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From b016c394c5ed6c8b2eeb9e22a203dfcac51cef60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/451] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From b67023dc61616486a58f7eece5bc5d30fa3d0965 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/451] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 58ae6a0ddc5a2af665dbb38a2da9af33d5eeea78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/451] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From a31b4a8700bad52d3c2ab8535881328d8c580d7d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/451] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 99a34dfb8fc0631491acc327e9966f8334f4e3f6 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/451] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 099944ba555..3b84249d9c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From f7d5eb3e46d64aa1e8a9d9278681fe25fcb8f310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/451] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 6d8ca80e890c8ac59178f4d95e9867ccdbd0df09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/451] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 97007a92b667af2ad82100ae26504e57ec6b2288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/451] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From de26f42a858c8e78e312019129de7f5e4690d6e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/451] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From 208efdbddf81ff3c43de34a4e74c246a2dc27fe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/451] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 6c1d9b6b38e421ccb89117dfa862bbe1d49bf260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/451] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 91b9322ed2bb6233ffe0857b5b0ae4ff862fec5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/451] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 51149321ab3396d4da44c1cc447de0f848d1cda4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/451] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 2b3f6287d343d729e93ad2e5ef68292f6ffc178a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/451] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9f7fe53d39dfe3b008974eb321c886ef253fbeea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/451] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 9125faadf8eac1219c83df876078a89e9624e579 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/451] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 047f5eca31fe2cd10b23a1430c1c267ed2445e19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/451] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From e739b07fdb435e74e54f80453f5a99f1f3974234 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/451] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e96fc53365473c5aa0d2c881039f4eb2a0771b7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/451] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 08054f513e2c74c185168aaf55d39ff2fe723187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/451] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 676cfa1afbe349703fbe4626c4495dcd061f2bad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/451] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 339fbf566ff2f9ba1568c35cf59d51e077efe31a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/451] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From cdf66707c0f866316e4a344b1bab3105e271d33f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/451] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d8506620494a83dd2d9d2edf55b0d815d9e814f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/451] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 09a1b050628c16ceba62345a5155bdfe92a31b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/451] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From c2864f86c253b295f400d0402cf2f4a3d9cc1146 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/451] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 2a5466b891aa9e2f909120e0d977a7f7f2866891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/451] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 162d9265a94daa3f1570c6e4717a6bca2e1bfb81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/451] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 567398b7c30921efcd3e52358d972874441516b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/451] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From e2cf3d63b275e30e836c26100f7428188b22f74a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/451] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From f4c4f8375d6feedcfbd0c6b290ce2eedb7048ed7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/451] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From e96a732ccc733604802e0fa814904535485dd4fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/451] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 8b5b97b348beea843c5df684fed72019e916b7d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/451] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From da7423a8cb6284c9b738941d7d019d9b0c12f044 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/451] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 3d9d980a5bdc1c34aafc740dcfd84dfc76bd8659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/451] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 46fafbe431959dacf8ed2e641e659b649221f8c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/451] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 0d856728eff20a9c8a0da1b75044953261acbb95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/451] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From e0a6c9d147a1348d55f591ffcca6eb31c0e1b9a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/451] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 41143327028018bef5a22607d21e9dd21be40f6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/451] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 483ac0c8619ba7c140510f9c19a92c911ee848b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/451] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0cbb580bdcc09297a17113f8b16ce30c6faae8f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/451] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 35052a49a1f024b4caa09e04b7864ebd5b210d5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/451] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 8082cf7b2eb74f6875e84c7d8b431e877bd9eeca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/451] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 469277e01750f623c44d5c77dc1443defadd42a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/451] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 63bd1d5d5beab1f454c1007835c5629bac1a2d84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/451] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From abbf404fa801dea44a24fc147b7439551335e250 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/451] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From cd66e587239d5c1d01329aa4d56bd64fba9efac5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/451] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 508582553010b87b0ca4171cc29d0957c6c4464d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/451] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From f9f24b95cd0b1ff4775c3435141fceeb6907e86f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/451] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 771501cdec08407b1f54b0c4ed8d91196b980039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/451] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 900dc1086db6b4fc7dadeb706cd0b78f6d08ea75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/451] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 104229c17caf69d29f2259057f760e32d5fec3ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/451] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From fa8116fccb2a7957d1a6ebfbeb6611945254d042 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/451] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From db1c73a1ea7ec3528299215e0c3b5fbe6b7b1d67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/451] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From f1be6076222e6026bad3340b55b1220025dc328b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/451] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 87443e7f2c664a82e5fe7bc1a63b9f25744719d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/451] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From ccfaff187632148979372c56190b1459713e4176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/451] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 3a74492809326550dc5cdf0d4839f84f1254a30c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/451] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 51429787b7f13a8f74c1321b4f81971f0bab35e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/451] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 5e07b0c5f83fbc047601ee0ee9d356f7a1fac685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/451] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 5401968a3e54b25734c7c05e05148150a9230385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/451] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 947b05f5cd2faf1ef04c24024c743bc8b81f5318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/451] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 01b817eb46ab74d4891b2cd0e577619b3162f623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/451] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 6586bbf7987b72465bb21e40001fbb6914fdcb3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/451] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 9853423652ace1384a549dc5cb347fb6551eab40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/451] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 664e087a4c698c59e2c3ebe4b77b62ec65589b71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/451] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 025590950263baba5608b74b14a5a016c24ad93f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/451] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f8604b446095e11cce790596798e4e9cf7a769af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/451] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From b6ceefdd3e8b66964c918bf6040d8699fc6d4ae5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/451] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7f2a05e8cf90bff295c7f2edc5e05b7a521475ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/451] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From de6f56135f7b5abac7aea8345d5f378503493b4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/451] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From a60a9f42205f7debcda3537c47025fca3cff57e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/451] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 0e76ef49affae51316d4b497269cb8907b1d5721 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/451] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 00e3122ee83271e9a498c366bae181db62bd8716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/451] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From bb66b7210f299d8e2cf894f8d1f255049565c190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/451] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 4366dcc24221e6f4c9418ed94eb3cac720bc7408 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/451] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 1c42830bb4ca6e0d163db3ab73aa6bc81e9f1b77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/451] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 01e845e749a9034f932c2339a6c4994277037caa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/451] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From ac4af7a4a851065868b068a8c892f1b45a849182 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/451] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 5d8221d81b69be05a2b871fbc04bdd029e6b90f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/451] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 66d6b935bd1031c39adb95a96051a89a51cd430a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/451] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 2225e448f57fb790c205578a40de6cc4f9843958 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/451] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 6c591024752e3c04b57c691cd6799ad253018c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/451] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 4824e568217762ed7360e1864a8f8d5a5915ada2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/451] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 35232fa6aa9720c5daa3372802044835985ea013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/451] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From cfb796bc0bfac9f27608e0cf3b66b1999752e2c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/451] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 1dd61b4096c830803ba48dbf73fb023cc9e4b350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/451] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 0f8f7ee64be1e6f15caacc6d1a8c226aba63491f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/451] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 249dec4db6ee86935bc1267c37f71efb04e5b2ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/451] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 50278a7af7c522fa9d4d240eb3485e3ab4a8f704 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/451] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 5d9ff0dd49f16f87244f24bd331d6bcc895c2291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/451] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From ce75879a37feebfdf5a6c466d3fef2f26c92ebc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/451] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 427b35d60d8d024d65f831cda8ce4143758fee04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/451] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 5805e331debc41827e955a4d429dff70f9d65b95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/451] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e8bf7d13a77dea99d16fb2d4cdab07598bc29794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/451] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 8e52c48cba4f7facd4c62b5b035891439ee452d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/451] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From a4d9bcddd49e4395ef261f10fe13abe88acf55b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/451] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 8ae71bc63fed14eb685d013cc5d8e93b60bd69b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/451] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 157bbe594bce705c0195849b9fb85ce0dfb7b618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/451] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 603c7bd5fc1dda15c3e35aefb446f44d0bccb8e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/451] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 4509b49741afb7e5d7627012a10f901ccfffff13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/451] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From be77c3074f4430d1d59b7b41adf7f336e93a1428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/451] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 6ca27a43056b64a163900e5329cc5cce4aeb7cd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/451] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From ac7acb4241265e5b30beed985bbc12684ff96fea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/451] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d1b2de462685da9d7382b4ecc68aabf1eb7c9156 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/451] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From b4aac7de435627a31bb3c28feaa928946b7ba18a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/451] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From b4a99d5e907cfdbf09a19946a22736b215738a09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/451] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From eb6c4470d300537cbf0a16f9a689772fae75ff64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/451] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 4948de6ef6e1c780e68f76e98f5e79591f80a86f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/451] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0e6fa1abe841202ef894045ab3006e6d7af55a4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/451] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 0012daaa5bff8698553dcf016373a33572fb4369 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/451] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 9628f0b4d75f974a732e03c9b5aa50011627b80a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/451] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From a7dda6c3e8e16a09a692c87d3950ffbfa6bcfd15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/451] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 6494e7339448dc4bcc036eceea95ea7bc8a44d30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/451] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From fb14f5ce483a3e1060b5a94d8f90c29782127bf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/451] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 06ebb45752844d863f1f36389830c010d967d8f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/451] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From da44c963af0116e729f10495cbdf30c071c7200a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/451] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From c0274d44f60f2bada453c66f43d931c2b4a61671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/451] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 438c74ca51eeb12ad7d9ac6990790500b010bb06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/451] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From d5e27979e5a28905eacbf2bc96894d75c1ccedba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/451] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 55fa7cb4fa3b6d314bd7d769ee42cc6647e7c5b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/451] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2cf8756734514f38e7e2761dd830cf13e65a78e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/451] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From c61cd319ffdcebbf10e4bfaf90c34796e6226a1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/451] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From dcc0a8db1d5b6d1b9cd28ca358e9eef80c9c5db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/451] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From c3f0a9edb13e7a4b8919c284aef1c5ccb73ae308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/451] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 4abe0948b0ca7246846cc214d47fd75d449a8c0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/451] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From d8fc87d789dd0845bc094c939cb160cbd3fcbbf5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/451] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 27088e6f43bd35ef5477fe1ac1b86144eae2f8df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/451] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 1766324779f70cc0fed3334d1c0c2cc833afb459 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/451] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9e2badf4ae125044a59c9daf81f04019fd4a99ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/451] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From e9dc719dc51758c3c5a5b8e9d234f9dbb0eb5238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/451] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 522cd2d4e789aae0e0050df774d9c950dfeccb50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/451] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From b159478103d8971caf96825f787691e37b7d1d64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/451] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c0aa7c64e95529d53a8bfdfe0105b6f9e5a0dd60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/451] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 63eb904dbedaad8cf41bfdc3521c5142b30e44a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/451] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 3a0aac559d9cde93f85096c572832606a9f997e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/451] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 78174824904adf402ac20b3894ea9862936f4999 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/451] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 314a865fd0f42745adf9d7c43fcc54b788dee767 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/451] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b789fefb21f85217a2eb5f3713e781675dcf431 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/451] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 33ce8646c4bf82ee88b1f8f5c50a7b5abbcdbd46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/451] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 5313dafa6590aad832e3b38faebb92d878182e1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/451] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 4e8bd5374f18cca8ae40b18bf9ae2fe1a1ce26f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/451] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 38fa23b33a409ff1e18e41c04b24f0a878a0657f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/451] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 2eb4a9afde86e5566857633abcc2df9c801ec81b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/451] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 94cc54a3e5fed1bf574bc4e3da0d59a4c1794eb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/451] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f9c5ffc59c26d79f2f93f93b6f275bd9e835e971 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/451] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a9c588c56303e7b050f4b44880991e59d7bded22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/451] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 5d3f31fcec1621d61effed9b788a0cafd32b8f95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/451] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 777e47f45e2e8b83c7b69114ea7b5d9580db0356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/451] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From a589dcdbfe3837c530b88db0ed47ee636b4325e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/451] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 44d1d32ab557374d3c4246bcd5af8b885d503cae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/451] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 87fe162d1a1de283a4805fa2798eb04adcc6237a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/451] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From faa24bd95956593f59af26617f8cd350b0575bb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/451] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 91345ccee041b26e27e384f58bca0d46fb59fec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/451] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From a2a52465168bd688c40745a23f68a027110f97ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/451] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4862eae2731b5c4c5ce9b2a89181cb0be082dcc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/451] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 084a8d4528b088bee9d3c604e0b5866ad29fe7f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/451] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9316a39054a0e43083e6777cb50df0be3acac1ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/451] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 8010e4ed833fc374de70f15a349e9023f50e4bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/451] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From edcdba81367d0aebb2a24888b254f53bf06870c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/451] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From ce245266bedb2e1972dc6fd83d8583ca4eae044b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/451] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 36569ed095667d56fa4e91675b625e074c963e8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/451] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 159ffc9535b079159aaa0623919924904c24f8cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/451] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b0740358819c31fdf9e348a72827cc35ecc46405 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/451] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 9d6debc180199a914d5bbfdcae9ac0a3b43dd097 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/451] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7fb065862bb676c4305023c3219e2076cfd71926 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/451] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2dabfd59236790310f8bf9607f6ff2f4a349bfdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/451] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b150e94501619ca68f7371012bfb0ac507645ba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/451] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From bbba3875a905a4c397aee7c02fda30cc3de7cd4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/451] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 5f067eacdd53ba30f06c538ed5e371a0657cbded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/451] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 776946a922147c8c4d957c30fc195da73af63f0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/451] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 3efdd3a5b4fb72513dd89bbf436afa9b7f16698a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/451] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From fd544b2590d30281d4d455dbaf5c8f549a22fbb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/451] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 81aaeadb9cae138437501945f34ebe1a08fad1e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/451] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From e756100fe5617a35e6b3d31aa183c62b1d777ba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/451] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 970d5d51200e45a627d17c62dc300a0eaaa31785 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/451] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 8d63c337aace62e3aa9c49011637809192e8576a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/451] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From b55cbd425513e80b7ffd51f3400b714ba3af1201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/451] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From f90ccd834e1beb8275cbd118f6fcdd0909e05a97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/451] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 442445300626b1aff7669880cd4d4acbc97c787d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/451] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From cefac2fd4b9e772638429b50da2fc9d1e83561bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/451] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From bbabb3b1701d258de6c0deb53d211999e82fb526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/451] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 380a1a45e09ca994947d487da0790146f6898ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/451] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From f5ef66dc46af1a222995f042f851c197881fb8ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/451] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 90f66620ae08d30add7866977120fd1e1fee5a78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/451] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 4d1019c8c6d7370e61b29437dacffedf21ec576e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/451] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 2f0377279650938ef667f8b40d7490e4f1eab534 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/451] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6f4f3142fcbd7aebf52dc7eee6463d65c93c420a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/451] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 1f8abceb35d404ebb9159fa2b4511316764fba1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/451] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From fe1df2509a08d9c4b0339eacb8cde2100b539f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/451] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 3b971545bcf83daf48a5999a7e048518a145e1bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/451] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From f73d27c93656a8da2a136ad45ad934b8b6aab0a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/451] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 882b257a5a284a01b32b2cc27faf81386bb42348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/451] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 0a48d5255535453a10135a1661b6d9f75c0ea07f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/451] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 5df64ed57d11a14b46b5a5952d74e69b58e3f2ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/451] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From d655c7f64e965be0df111f595e892c144235f437 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/451] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 08bbc2d82f934924449793224be3b7bf6e82a6ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/451] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 2831961432e5d6059cb6a0bc1d4ee1f7aadd43ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/451] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e394fa75f24d3b8cd32ee6e77fd9c801d700db83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/451] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From ca465648963162fdbeb3790c7383281001b62bcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/451] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8ea92fa2a5c3f70e41c121e11473c6e2446a1e97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/451] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 156524379581c169b9617a9a38740352aa00c212 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/451] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From fd72b71ba63dc4e223aece04e9fab119a2606afa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/451] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 6cbdcc9dca4d6dcc95d407286e2e5745eefa5413 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/451] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 922fc6e078987aa12b0f5b4235e3fcb125c0a907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/451] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From e49f3b4e43753ac03504cf227c418375114550e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/451] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e99a106d79b19e17cae84daf73a4520e9a0b9b45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/451] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 844e193dbf92c59cb1c154056179fd2afd30638f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/451] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From c064042e301739483880929dd9939dbec369eff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/451] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From e673dede582604528941b23406009146afe0bc89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/451] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 54cea6fb821759f17099fbd2383c53ca0b3ea285 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/451] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From a7f54068cf931c880527a733b1168cab4c8b8349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/451] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 671e2627e237d141ba3ba87ca30300b8920a0689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/451] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e..b7905e70e4b 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From abb5f0d81c4e4082ec9f5723b6e7a85d61fadbbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/451] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 3840172d2466e99504bf5dc5050e73d8ea5efbd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/451] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 39874a56c2eb4d970d89a917c649fa618ae905b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/451] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 3bd1005d18e560a37c1e00c7f241336acf85d3f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/451] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From c9188b94099e6914ff3a2e5d023020aeeacab988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/451] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9a4b9ce996dee0b1c6adb636d395b569b32bd5d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/451] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From d81baebacad285ffbb5b6979febe725d20390652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/451] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 336e38316cb6e0f7b85ad86f0544792d5c21a1f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/451] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From f4877127de3e57dc62387b3f272d6903596f20c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/451] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From ff7e354b1f20a89abbd938b4bbd1940a06e2b222 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/451] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 8fec1d391ff298be2767b956a94ddefec8a36b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/451] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 10631dd147da9856707f1727c85d824772db4428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/451] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From e2c8806a42da4905abebe82318caf18f6fd2f8de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/451] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 46d74ca3ce219baad86c9d7d3b0e6c964bc1a34c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/451] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 11de7b3596a5d9a5fd4e3865a3f19f7b1cd851cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/451] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From ab0b2fbad18d5a3f74187a2d5381dbbb52a7aa1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/451] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 3a007ee541cddd2547b65e0ec388b3fa4f843b1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/451] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From e3c0ed07bf7dc44dcf247b55d82902c0ec370ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/451] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 5f5e48e2e78ab75d0368c1dff6166c546dd54904 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/451] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 61a2e68821bd08720f9ea383704f50ebe5186d9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/451] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2aa47402e40a19e99066c79949180f3df67d226f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/451] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From ccc9430437a5936c1d6cf5f080dbdac57571817d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/451] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 5b68d9539d64b07fe865bac76aeaf7eda84d1193 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/451] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From e89fc490e79b09df7ec66bb397cde0bc278bbb34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/451] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From c6fe69387058412bc93cb4235cdeeacc02442705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/451] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 52e1695b7637fc01bbf86a1d18667f83edb35636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/451] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From fc6316a66a07f493c32fef37689c732537eda980 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/451] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 54c478c6510570e12cfd977a263f065e8c85f008 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/451] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From db39bded67a84b763f4607772a496d5b80bd9a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/451] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 63645e1ec62d876d94d0195efedf3e7801406f5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/451] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From c2f3524e5b462606fb3a178350c783461057bd2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/451] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From bfc97588f02458e7cd21ba727f2a988633b3f769 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/451] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 3aa428a3b3fbf9088a0f637b8d80bfe6b9dcd8f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/451] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 03976e6d5aa1e18e74d803871d4650997357391f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/451] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From dfcf697fecdf163fe28627d532aac9c1f298c423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/451] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From b0b8e1178c5198d621b706a734ca248a6e6a5b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/451] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 2fc552e72894ab27d0e43afc008297ebd2a8f386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/451] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From ea5fa5e1713c6283a9c5f596431e9df6294bc52e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/451] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 31df01163f6b2171e1b6775c15053034133c0b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/451] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From ba8aa84554a4838af208dda6ac6edc87851e5cd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/451] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From e7bd43e229c52640404cbbafc4f70ca0cfde8183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/451] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From c7eb6ac0e4216e4889a719f47ce87d4bc022d618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/451] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a01d4c05ab312456a087eb48f82d1f958c7ae113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/451] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From dff5836d9eb82fc7b3d05bf81ecb85d46e341c17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/451] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 86091b0241a472a473aa7b170b6e6f64da6b7d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/451] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 9d2e55fa2033595db5f1544ce918f24c1be09830 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/451] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 298677447df9127aabb09db26ba721bb2774ce0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/451] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From c8ab4177bfa250c5a117d594262187ebf6764485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/451] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From a8d178a029583e7d301b86a2543c6537e02a6578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/451] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From cd6611f8a68ca9360a483f92da1c4f596a457de5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/451] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From 215c0209fcef32fb5d3a0b6dd9bcbecd7e6314e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/451] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 3b32646040d3d288acf5e306bc015064b244abb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/451] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 1240ed23ae80061fbb12474be0102fb7de52ba60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/451] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From e4579730847188fbd1f3d46e550147ed340f2ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/451] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 8c44367ddc60a108136187f14876fff25785f102 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/451] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 2e7af7003a8ea6bead5badfb2bfd01db73ef8c28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/451] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 98b650adbedbf3fb97f0d5c8bd856f827c25e634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/451] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From d0881aab91c6e4f0f0e8822b81e96df854226198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/451] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 28879528df61b4b208a21ecd5ece3fcb8bec4ac1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/451] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From e8bce9d2ad31bc15ef6354ee5bb32cbbe078bbeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/451] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From b7c4b3c8efc203b74add89e6ba97b40cf2711932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/451] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 572e202219f0698243cc796f832de829131c332c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/451] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 80b3a2ee1835108092c7ca28bffed0ae7d90e299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/451] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From d293a00a2417a00d3d812e526b2b642e2b54eac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/451] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 854901a36f354055c79334db26753790ef6c1454 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/451] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 657ca1029098bfe435eadc5acb9fde4965a4a4fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/451] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From b3d4ef71c01de7a87e9bc1b575cdb0f62e6df495 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/451] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5925442092a691a52d9b64bd4ab2cd5c07d159ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/451] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 05bdadfdf02d2d6ca45be6e75fd59109920eb5d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/451] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 3a5e125784e0041e8cffc97d9c2be757f0a1f63f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/451] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 4c5886f5fbf8fad34b89da6888cb156380c3874c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/451] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From e908f3942ef1b932e5278c73852cf8188245152d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/451] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 2455d1215dca951672f224b85044a47b3fff8e8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/451] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 40acf02b0d9ba8aa944ded526ae707a39b8368ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/451] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From c6b1d54457dbfdefe697274b0c0efd7280653a65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/451] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 73aa91c91b37edbef32edf5bb7b6d68328e15750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/451] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 9accb0f3c9ae49c923775dc27f846fa95aa3d546 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/451] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 8dd740cabb2879bcda8270d52e80600c82c130f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/451] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 030daae3e6c31614f6b161c0784cdfa6637b3cc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/451] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 7fdc613087b8c0fded740fdaff5f6e6390a15b52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/451] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 59b978543b4dc624e46201eea3cef756174f5636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/451] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 841e5741bdbae7b33708bc234cd43d8c94126389 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/451] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From d573bd36d669bda8853069ebf9ae9d6eda9aaf3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/451] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 15b2c82720f451d2c5c9dd5f8745941f2ed0f85d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/451] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 6b564b1244dd5d8f631cb9bf0bfd6d5ce643bde0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/451] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 8e6681020753a044bff705bc946f308d4ecf2324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/451] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 3803dd761c0a0e44cdb6c5367e0e00a3463a1cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/451] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From bce22ee8a640e941cf66b04b0476e6461d997b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/451] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6dedae447ee5785e42a9185d2cd3c7cc530bc78a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/451] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fdf3eb7a3bcded5b2b8ae8ce8f2b63ed1dd84550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/451] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 3f7d978c555e6f6f2f165e2f5648f25382b9f3c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/451] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From e4a49eef71ba51e4e4cf26ed5fcb63461637817e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/451] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 01022c750c802a674aeec01ea21e3953f610b3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/451] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.8.8
-revision=7
+revision=8
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 hostmakedepends="unzip pkg-config"

From 2a611a4989d3bb90872cd3f2debbe2e877ff15f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/451] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 6f968b40d6faa2269c600091570add0d4142fbb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/451] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From cf02716f01be95daa089cb7d9e0e6e82344ab88d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/451] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 64270a81047ae20236e2cd59dca1f7e99ec53ec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/451] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 63e39678f4d2bb3b37527be850f95a70e4268672 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/451] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 64c94dba622167c329f2ad19993d29de0c3dcad3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/451] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d94def29dc8402cac3d576a33e96c1f889f59113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/451] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 7ec28936b657a3da325fe29323c62aabe7e94786 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/451] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From a2a6b33a163af2afd8bc30fcfeb54aa0a7a53737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/451] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 21c21852be76c7e3bcd64bbae151b93d43177223 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/451] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From f52d9cf530c916bffec03f1757c62890e2ce61b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/451] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f0854c7a2fa00fa42913b4b62ec9b1d3e439311b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/451] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From be624c3228deb5aa721bef1d0237ff3781322f97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/451] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6f9c467111da7458b9892e336c7402561da5a8b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/451] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 40b2404d651752dc7fff165140d18d57d1785733 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/451] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 2aabada9364d40f28d6a3182859896dc1d68f47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/451] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 960cfb9938d68c34e1c6cf246c33d2b00226cd11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/451] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From e32b93caa3130e6027e58c733140ae387df336be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/451] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 0c521273a6920817ce6d3b1f329a13b85c54752d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/451] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From d2c483e01c109f79669a03a2516417c150f9377f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/451] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 52eda53dbf10860341eb2c42eaa0816185d8f4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/451] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 04da5bbe165817232ceade4ad4466d2f0f84340d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/451] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From a332afd661230825c2b710c048db57de1d05757b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/451] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5f12e7d0d0159207351a6d17fc4f31a2338c65f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/451] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 48fa8d30565614911b703bdb7ffe4fc308ae6413 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/451] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 81c9b7171e2b802b40d25fab86f1f15ac6bce920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/451] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 6fb9dca5dba9abdc2432d80e2a57687dd7e77c80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/451] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From d7323e1e211073259c16dcd0acdebf1bbe55337a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/451] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From b28c657a83049dcb3ef55c650baa715aacbb44e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/451] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 9cfc6598a9c9e17797a1ed9ca1225a6e75667aad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/451] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 99a91f581a06bf77bf5bdcb34219d68cd91062cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/451] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From b308462d525dbaa019eb776fd6ba3e7bc6e97472 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/451] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 757f91de81526bdad3d975e17d2fe3c59d934b70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/451] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 3618b88b0b49d4b1a6bb2a3d15e584e7bc7a959b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/451] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 89076213188515d7a83629bac1feef4265c64ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/451] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From a1af762453964a7cf1c9188c7592440e4f114e25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/451] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From b5e749026a992848b868c7bcc71fe66eb5ec69f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/451] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 22e46b711c9d31ef3e42c2738277dee4b3ef0c57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/451] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From d64f06e77841adc8b14863cf0c5cdc88f088fa74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/451] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0cfe2c15da50abd60fc8681d91214eb148ae091f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/451] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From e3fcfa492b056b61bfd14be0e4997bb3cc89eacc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/451] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 574fceff72aec14fc5bc80b334d191bbbf7defa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/451] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 57041f4070ff78dcf481b7f269d25d797d081ba8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/451] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 5fda54083c0bb7b84be6b628daaa66db786011ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/451] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 822f46f3757bcf4c84633c2a615729b35b1e84fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/451] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 5dc5c9abcb86b8bdaec51e390e91cde74f3fe302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/451] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 124adf520ea6c2c342943ac9cba4e70bfbf258e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/451] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 39a6189359460ab85d063de3804e76d0ea04508a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/451] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 9a3da754c9c96ed90b18a902abb93d6257db8668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/451] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4f87b56f24e6d0cd2c3d6451010ea08f611cfd5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/451] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 049c7996db2c18ef59909544f9fb1201c48f2ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/451] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From eae742f59d8167dc352b7d2188f9ea9aa675f646 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 359/451] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 41a8be688b7d3c2cc992610ac3ad6fea13b2fa92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 360/451] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 8ba8c38b80138c79ad702415ace724ee65b87d20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 361/451] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 536d2c783bb221eff67a7230257686e0a73dad5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 362/451] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 42d2ecca023e83987aa6dfe10d002acafa064b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 363/451] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 9780dc0d65391eae5aa5c98609a57bcc39b28ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 364/451] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From e8f8a2eb5ae081fed66e8332b6908c72dd151c2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 365/451] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From e7aae2262e1f13107caba63be340c54c2c696316 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 366/451] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 3e035f2941c61f5f6aff849a50dd3b969dde99c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/451] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 7f431da6d1f572358e876b5e57d03de417894fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 368/451] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 0fe98edbf52a396f0717d0d7036c3b50e532117f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 369/451] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From fc888b3aba17f216f77b0409e6a22d6d7d0a08b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 370/451] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 19da38caf11b07210fec964baf26889b8afafe58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 371/451] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From c08d74ed3c7342c587010684c50b6ff32c74f3a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 372/451] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 64e1609843866b5d62a14b2e7cadd6059750550b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/451] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From c348809463ccd97462ad08a08b091c3dd6bb985f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 374/451] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 963e9a8d76ddf3ced2e77ca2b2cb4123ecf0ba30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/451] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0f1381d6745f68dd9b37a4a92b1cf5295dce47f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 376/451] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 65926dd9b77c258422acae332d775cd3214cdb6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 377/451] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 16d00a17a3a4ec9550edd6c5bd2aea65a3493741 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 378/451] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From e96bb2f7ba7b5e571794bda7f3b0818c6bb1d8fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 379/451] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From cd0edc0fff93129a497ca7993b05dcad0705983b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 380/451] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0543baea6a4e40ab3dbf1fdf4d518bd4c68aaf93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/451] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From cab7641e0f70f098398db5f72a45b4d988281825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 382/451] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 4d0f31dbfb4a595674ba37cabea375a6fc3e21e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 383/451] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 3658aacaa313d99e2ab5b8d30143449482633d17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 384/451] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 67496be43eec57d6123a489d9bb85143ed46a9f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 385/451] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 6a641eb1ef72292b65ad370de42ca9c407075521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 386/451] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From af7f0a8273de120f2d16f748786d2724f0b97ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 387/451] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 309e3fb1d3de26b954f0b6df8e463d480113eeb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 388/451] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From a493c49e4c6a6a7fbf548fd8c78cbd05119bd2da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 389/451] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 906e639b0bcd142feced5b338c27f113817cc1fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 390/451] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 14aae771cb8fbfe552e63a66419fe9ffe6ddb505 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 391/451] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From c86121117004b5343d640e09f31e51f8652f7c2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 392/451] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 50327e75659097908aec6f67675b4a2b1d637210 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 393/451] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 1c79e257e01057d030f8d4f77af9267505d571e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 394/451] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From e5b5888fcd67592240bb7572c55d8359ff2021d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 395/451] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 7aca67e7d2574172c7a24ee0d0c3a5a1c970e655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 396/451] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 8bdd539355a57ed711e2ce0722245db94c3ccf46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 397/451] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 1778c25f1ca69183a5ac2d7c4e3d999af5962549 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 398/451] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From e59b68e91f668add127c8b5533c865d86cad3d45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 399/451] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 1d5906c6757d2a799ef34f43a039d04c47afe754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 400/451] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 98f1470bd2e721f832a20a02e8d09f7db407ee75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 401/451] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 08150d3f0a0298537214368ac03fc867ffcfd414 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 402/451] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From a5facdd2545a1fff5de1fffe5dd443a10daa7f2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 403/451] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From ac18d6a68f5038a2f5bf13aa41b620da5d6f0933 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 404/451] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From d00fddce6615b9ac67277e8f8efc68eae5e1764d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 405/451] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From d616118b05ae9932c892edbb144400353b59b995 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 406/451] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4d2b540ba22a77c412e0c6f4755df7bfd46e444f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 407/451] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 3f26e836a20c61e0db8be3e0a20f64243581f2a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 408/451] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d6943b8930a4250e79ffb3204e9dfeebb6efae16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 409/451] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 31364ee4fad50f9aeb7117aae088bea6d656430c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 410/451] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From d3c1670cc1e0765f4c8afa3a62c2f083c90a519d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 411/451] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5278e6d4231533aaedf73326a84d774b42fa32b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 412/451] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 5513daae6df2448618e850a753b749bd02ec8652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 413/451] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From bd0f9c4ebefb54ac8cb974778002d51f513f74f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 414/451] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f334dac92a229f141d934781fc47a248342ee516 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 415/451] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 25808c7ce03378cf9c667c8b9d22a436c9117a69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 416/451] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From c16dea680a68364540c5567215457d00071105ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 417/451] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From e1f9bf87059f4f0dfdcf136596204a8c78f1a274 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 418/451] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e40d19157f7344aa00504c5d7e21d79fd87fbe53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 419/451] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 5967f84e767a77650ecc4d8dbecd75b601c80f5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 420/451] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 5bdd83e5a10be30884489fb078f7295c3533dd52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 421/451] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 07d3a91931bb4b049f70bb516752bff5539e7a81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 422/451] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 82bc4cebaa057d35d0e3224b7d9b47d92a15fd0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 423/451] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 2509105e6f27987bf3176fe4a8ad4112ec3e3eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 424/451] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d20bcab9fa945d5d22a3742656942c2e568455b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 425/451] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From af465885f3e2fc218b73e8ba801305d1c3d8224e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 426/451] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 730d3123965b12f323f9c7ca702c52dab312a875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 427/451] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From c6864b7f9ed96dce92aa792aa52d9199b67c6928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 428/451] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 79f7b9acb728e5b7a0d96399e973092cb3735b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 429/451] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 7ff121f273e1200cd02c63a258d1c8d170946e99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 430/451] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3bd67539230ae9e1f234eb696820efb30f052aba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 431/451] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 9bf222b7382ce108e87028d5eac932cd47bd6b18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 432/451] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 456ea5c658af6253a55e930502e6579b58876040 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 433/451] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 179990fbe8ab907b570e7dabf5401234de0197e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 434/451] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From f275e7a0120ef5635c61897d44e453979e7e8654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 435/451] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From b0d692993a48ead3cb4af470959e7c2cf0fe73ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 436/451] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 4f1bd9d98aa8f3f75d87a6eacf4361c95e8ccd4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 437/451] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From f16738b3a9e0a3e4370010fbf179cd7a704819bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 438/451] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 4e1d2250521d30f0dee2cda7db1461173d6c1537 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 439/451] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 15cc74f5c80713d4b2ff765748ed45e5f3749597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 440/451] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7b0cb29264dbca140ea182f588d9f6d27c9b01ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 441/451] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 9dfc2fec6184b295dc5ee1064c36d4b3a328440b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 442/451] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 88925a63af968a6468fd5131af35528986b0f05b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 443/451] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 2a91c829c93e62db9321ada83433861975578b11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 444/451] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 55304fde2a1d300cbbe24357a7e95837a0f9b193 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 445/451] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From b182f0cf9f54ec76eeb0ee49915668847b79abb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 446/451] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 356ad4a8ab1220724951ab41c531b9368b163c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 447/451] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From dfe25e1c2e23b41e0946cbeee1534e7b1035425a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 448/451] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From f927f8b5ceb40aba64e685e8149b0de01e2f6153 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 449/451] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 0244a28b13ce9ae0859a94e18d1f5b4d5f6c78b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 450/451] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  1 +
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fd0328005a5..a557ddd8e15 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -220,6 +220,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

From 252787d0b6be903c9bc1667506407232ab297a4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 15:42:01 +0100
Subject: [PATCH 451/451] mesa: fix patch

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
index 8228101b2e1..20b4bc23e94 100644
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -1,33 +1,34 @@
-See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
-
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h,
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ -	2021-02-14 14:36:02.838935228 +0100
+@@ -42,8 +42,8 @@
+ )
+ 
+ libintel_common = static_library(
+-  ['intel_common', genX_xml_h],
+-  files_libintel_common,
++  'intel_common',
++  [files_libintel_common, genX_xml_h, sha1_h],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
    c_args : [no_override_init_args],
+   gnu_symbol_visibility : 'hidden',
 --- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
++++ -	2021-02-14 14:36:36.898986675 +0100
 @@ -57,7 +57,7 @@
  
  liblavapipe_st = static_library(
    'lavapipe_st',
 -  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
    link_with : [ libvulkan_wsi ],
    c_args : [ lvp_flags ],
    gnu_symbol_visibility : 'hidden',
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
-@@ -39,6 +39,7 @@
-   'gen_sample_positions.h',
-   'gen_uuid.c',
-   'gen_uuid.h',
-+  sha1_h,
- )
- 
- libintel_common = static_library(
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ -	2021-02-14 14:37:08.623233120 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 552798 bytes --]

From d816809d0bc85dc4956c3b12d8b1eef8486d8a69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/451] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c..099944ba555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 1166228339d8ee54e3c6c73f3b3b5046f7cdf1a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/451] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 44dd4130eca93045526fa8a740eec556f3b1c249 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/451] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From d599f7c65569ead22339aa35e401df0805e497b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/451] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From e5d970df4632ba73e1de8b9128bd5d89741b37ab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/451] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a28ace2bc398801f334cf1912b6357e03673982f Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/451] New package: openssl-1.1.1f

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 099944ba555..3b84249d9c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 1d84443efb795ea79aad172c0f5f3bee3dd52964 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/451] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 90f09ea3e5298dfdd44efbc5c6a86624be13896f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/451] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 55f85d597895dbc59e3b187b64ae17e8a53bd499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/451] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From aa6d0140f782d89ee773a0646154f354a073a834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/451] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=22
+revision=23
 build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, ICE"

From ea03dfcdb9f4cf452b7ab43a241cc8dc4eb15ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/451] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 0d3c3b023232a7ebdfe60469bcf8b4ae2f0123f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/451] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 9b49307b0bca5618f66b06ed6665ae5d87354f54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/451] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 04339a7e26854b6d31fac9f489ec681fe4d3ac34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/451] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 56c61c92faac35710eb6e1c29ddb36f5e097fe54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/451] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From ffe0e9694bb017717f9ec569ae87305483162b61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/451] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From a88985659aa496894e212d2e024bf497dccfb503 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/451] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From ef22dba4f5d3e178ef94db0a8ed87e4605cdf636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/451] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 4f659b1f05c72695905b263aa5439d3ac9dcb07c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/451] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0bf74e73ce4d4221773f4d3b89f2e21d7f64b3a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/451] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 0b5c02cb790f45dc3898f11559fd3c7480d03d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/451] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 8b68da1e2cd0caa6b3db23373df7e6a3e3cf8cb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/451] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7193e271ab48c55f748373f07362b6a0a30f5cff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/451] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From e181e8bb96857b038afe8338e558b5cbe9225e83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/451] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2a0be9b0fd55999908cf88562e52458c12f73cb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/451] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 564fa5a61d453e4c6ed9cee562d8ba637c502be8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/451] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 7d0e770e336c92580a1c73004d611f5db7f0b53c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/451] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 66b95aa8dbfb6a7b6745f2e1c367efa8b761634e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/451] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 7fa08fab916f3f0c6ddb01afa8ff23147bc1d58c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/451] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From cb9f1a40c7250455ec5518b704865b4bc8e57a1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/451] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From bfcbf26dce9ac99d849c2932a7f20a9b678081ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/451] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 785de67af7049404d3df2ebe933a4f8c0acca19f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/451] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From b7375198d48e3e2ec556ed34f6f319629cdc5ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/451] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a6fb03515c59eb410080988d8ec85342163d8f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/451] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From b7d2712c9c0a1f464994ee763e71d40468170924 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/451] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 224b678c63bdb6ba95a1ecc55ed5949e35e2bbaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/451] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 7de8c6e9b1d7c04718fa9d70a2620b203067ea6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/451] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From dd161776001857cb69303ecff1024a43d5e5ab01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/451] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 774dec90819a73152a5c282a72523cb29dc2a6fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/451] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 84644c352f3bd053a396eb4102304c155b02e62b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/451] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 2672953fe7a6b7bd4c04733f68944c38784d44e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/451] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 5ffddc0c01c9c85e65be13f47c2d653c9037c0e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/451] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From dcf502238e0b48a7513aa6928a2e0481a24526ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/451] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c514a7680f7e39b43b2a40a0fbaaef182a68a824 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/451] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 484c97b84d787f2f2230f915970b5325b0523769 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/451] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 92a8ce2ddde6680848da47551a085af73e9580e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/451] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 30f18c307697751530408b6ccce75fab5bb1ac7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/451] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From e16eb70568e52bd5b6dd4a3d662f91b17d2e77fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/451] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 7a00bd15ff2f4f36f679c5f75634ba41f9bbed6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/451] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 72661d66ac05dc2f01de330f586dfec5a2eb728a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/451] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From a3b2db38634f71b4fd45827a6c876c4a70547553 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/451] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From d3bf1b5f74a8a69cd1a3e6fb99fd29816ebd754b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/451] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 297d730d2153d9d97cd75534d33997a091e01a6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/451] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 3f582d995fc8e3c1a943a8e711d6d56bfa65fdc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/451] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 262d28a836109a35e57c7e4bcb160cb5282749e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/451] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 83713bcb99ba1d9d10d66573bd08a8cf36901b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/451] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From adcc827eac8ba33661ba1c3c5cfe606771db317c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/451] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3d733cd806f53e755b9d5dd2e53a469f4c8bb0f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/451] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 59e2d31dedbc4562462dfb71ff63374beb483789 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/451] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From cd5335ac65368003b559f1946bea4b2f09d914de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/451] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 4fda0fb2d12f37acba114810a5023c50981e8fda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/451] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From e1e6a1d5d7d58a4533c7c86f9089de96a879313a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/451] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 416cd952d31fc862944cd9e17d70762f1ed586a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/451] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From b59f113c0eed2129a88383ca03b42316d701268a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/451] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 13fea67e84259eb0dcf018dff3b87137d1afe149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/451] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 909b730da742c1c6190c03f3d05eceb180d0f8e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/451] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 23f4391d289719a0740ce0a27382ce3fc2afd349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/451] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 06c534a1713f2d7a60eb9536a382981aa40c3a3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/451] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 3a41fe252e3fa7bffc1139c68cd23c94c3b509a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/451] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 9b8cdd0115881f4764db73c6b21e92ba599c2e4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/451] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 63a4d82502dd5b864e635b3cdd70cdf7536e0057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/451] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 0cceab744e5cb9490935aacc966010ddf605942d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/451] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From e503084d182949d033716a26366e710b7931015d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/451] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From f65c471d691e7236c80455cb272d6d3d725aec66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/451] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 14cd2a49f6526a22734348180936e241869856d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/451] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 9a0bc71232ecf521dbe14364b1c5dadb47000d75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/451] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 4f73f1ad7f23d6b6e92c0c6e034aa7e8016e3f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/451] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a09b6dcca87bab4e3e3dd671c2a0cfbb41b5168b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/451] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d79e053f7e27313418936631de3ea88c68794d65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/451] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 75171eadb131368fecc83aeb3e4a7fa497cb8ff7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/451] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 0f3415a4672a1e7d9b35243622e820f0f87a0761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/451] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From e710bdaf2a29198c4b9a9b9f87c98498e8e5aef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/451] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From cee199ac040fff4c2b5d6f286b2aa8f80012424a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/451] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From d2f1f28341106af67cb13a9292238ae22e42436e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/451] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 9ae15f8487a73178f8194fb47fe19f88be8d383f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/451] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 4331a4dda39f17100411a240e8f8c1b59c45b1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/451] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 4d3b0df4531435760e804e3e508be9be6f3c5113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/451] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From a902faa5eb20db479c4ae44b6e2095ff59841a9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/451] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From eb49f8652ec5d1ee949f7e3be02a300e3217d80c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/451] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 97a3634cc0d13d0f33ed76af765eee666f008cd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/451] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From a3d2185d1dc335067aabf725883e628402c08440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/451] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From c3e7495d7f8a34e2a886af59581dcd70f40d33ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/451] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 1950bc9be9fc055e50f5e9afbea56c0ecbbb0a66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/451] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From a46a7d63ff2354670c77aaa8f9b201b28970868d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/451] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 20bbfc4f140b5272ade3e645604fb86e4d9cb4a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/451] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f4109b2bcd44616cae05f27bff9d7e10519c5493 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/451] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From a4c2805705d0553678d8d407d2a71087ba138c5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/451] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 70c8baa02f5add7b9df9a930ffd659dd99a849d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/451] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 5caf46a0bcce00ac4c568ef4b6f3dc8c80783664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/451] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From ced2ebe741238d68496cd75dfec8b37173946fd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/451] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a402d8b235933e29a7eec55e56da587afea2f4e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/451] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 3ca712fd8bc0a5b8b52a81712e50e76b521017fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/451] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 9536a59a0921aefccb6a962a8547589c324b591b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/451] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 50a047edc0f3b17f7d09a5f41811af574c8dedd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/451] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From e871a8db88c482902dec95b75abe8d75fc4799bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/451] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0f3aca52153175f9d781c3e5497ecd7fed155977 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/451] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From b8dae78aebaf398364bad8a06e62afb4544d2857 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/451] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 46641668970d1012438f757b510c319d359c912a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/451] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From a15d04c0a25d02784f94f60780a552a25e674abf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/451] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 4303d54287cb212c69b3bdc51f3ab0a490a71ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/451] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 69420b8fa4cd572ca3697ded14d9976dc946773a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/451] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From bb627d60b91c2f6eef49c393e4cdbd0749095123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/451] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 861d97e8bd404cb53302211b4436eff6e1707b6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/451] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2681cade96e408b6f48404069363129494a829dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/451] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 756caf1d75a9119400527261ebce078344b093d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/451] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 901d81a7bc353a05cf696cc2f63e3d627d09169b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/451] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 1db768b0827b35b39243014f01e3b88d26b060eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/451] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 3e0b2b805992d3f5267139f8b144e723d642b5f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/451] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From c929b0335c513e18a058f4abd1084f0c1796634e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/451] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d023fb356dfc3d40d9b767288a7e47056ebdc38f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/451] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From ae4571628ab6d8c5a2778c2e90570699a211e4ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/451] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 2a4ed0f6838e40800ff56b5241101361591e523c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/451] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1b1aeb48cc6b65480a38da9ac1124bfd120df53a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/451] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 89b71a29929a49bdc40cf7d2171037933bd30274 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/451] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 926db34649b53c22f87b2513a1d221c8be650edd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/451] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 8a07fcfc0ecd0550d5358db4564ea5f552f33ef7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/451] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From c460e6b3ea197f81236b5e0f732a9b80b35d6618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/451] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 648caacf0650b36eaa43d86f1bfc853c7e18fc8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/451] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 72a5611fafeaf750edb8c76cfc001a8c8dd790ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/451] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From e7714c237c8742f157d157d049c9c729bea9be3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/451] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 89a6aec70687f8630bb92a5c2444f639eb27859c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/451] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 9d566516e1fffe23f4a173b0e95de709c5ca58b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/451] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9478549b6da734a839542ada9ea64dc3156ae161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/451] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From d41b9243367721d0e5bb13ee9dc499bc99243aa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/451] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9763a3a15840bb197be2129305adcd04e9230e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/451] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f6725acdfe95c132f107c45fe0ec42bae215e59b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/451] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From e025cc48535a0eccdffb14bed052750c0f7bb89f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/451] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 1129770ab9342ded4172c3daa63d1636cc2ff3d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/451] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From f1655fe374217699031d90c0e18aaaf8eb80f6f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/451] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f7060e0b1e4856c1d23d54372fafee9d5ff8578f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/451] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From ae0bf4a5eb3cc90ff2f9ba2d4a8bfbd0de0f28d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/451] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 939a9e07ea74cc87058bf81ff981e5d93f610a66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/451] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 44977588d7fb8aad866175b770eee84389f5bc90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/451] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e57667385173ef92d2bf8cbdc0e69f208047cee5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/451] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From a3a79fbf9e5ddb059ad62f172726e4c1ee2dfcc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/451] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 0eb886d862714ed56799ca377296479937d619b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/451] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d0152bf7249785951af4e8c5dec587fa7c83afe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/451] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 742da9e80bdd47d948203acf01840a24a99d3902 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/451] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 88d67d782842d79d8c9ad1c7927edf9a1365cb47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/451] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 09d878a7ce9a0a696ed319226d602bba5614fdaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/451] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 288d3691187b70e451e10b3fced6eee5256967d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/451] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 197f942dabf19ef4eb42b3a3716e91a04bd0a3c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/451] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2d8e6cd80516932b08c450f3f0775902b0571664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/451] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 2046523228ac19d3d6508214328006bddc54a505 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/451] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 7ffdffa5a1b1c59ac6c0b7fce9a9055e7baa99f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/451] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From f576230c31b9928b4338ec153139b795d80cc1ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/451] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8e0e63268d42bb3134cea637831445b5976c3ec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/451] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 0509c2366d74a832668451a894516a228358f9c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/451] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7ea67dbad5d978f9add56762a44eed87802969a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/451] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From cbe13a7712b376409773ca651662f8cec9cbb967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/451] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 299600e9159283276fa0808e62379a6583fcf150 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/451] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 679d4c060c94b80ef6fc8fb4eaa710038621da51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/451] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..92ff4241b68 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 4cef6edcdd596a98efe6d3b3358f3ce1605d86e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/451] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e57a38bfe882c29c04398e5a4eda75b7652feb54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/451] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d1c874645e26561c6a86b7c17de6e3f81d4b119f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/451] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 5a0d5b0e8038b4e8c867b8c349740e2e9edae9e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/451] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 6d7821004944399b6fe8d9b7772872dc4e52ab35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/451] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 137032412ceab9ddbb2c8fe3953511b96676bc63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/451] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0e29fbd46073c435d046e25ad068dba8d9872187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/451] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d561c96930cf8e2ff3c2ca728a617b5a84e7756b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/451] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 869bae0059057c13ff5cad9cd45464b747746b85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/451] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From aed74b95c7a0d7435eefa5aedd14ba8fe1a41fe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/451] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 478abacce93be980a31cbebebf357e06068ba3a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/451] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 46525ba5b4582c724f052bf670889c951c6c5578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/451] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From c1f8e49fa973829ba40679ee5fa219f281c9c49c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/451] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 2de53057a5314b12ed6f9a34aa5d1de058493d27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/451] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 97db44c3e63b4086618e82efbaee4ccde9f333e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/451] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From e70931a6897277476d06bc8b61a9a278acb31418 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/451] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 18476f940d5e51b9b1a93b457359c0aa51f455a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/451] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 956aee84915df54c047e292828de8ebb1f336740 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/451] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From f1e5f90b38abd33e420a6ea051a9b5ab8d40ac66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/451] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 2dff1b2a24addff83c2c768c212d2ef828f1a3be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/451] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From e554f92d5bb2d4b48b8c68c4f97abc66e4083013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/451] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 8a1bbf15cb7dc75568858220196bf90d1ac7a13f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/451] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 064ca9c062d8448c0e5641a25bad42ccc9cc8a48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/451] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 1f20a0f0189d17c7ad58fd0bc83dd6afa749f2a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/451] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From e89d61fde57bb9ae3202e90492acc0f086710269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/451] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 9342eee032e8c1d8049d4a3a78658fab6ad6262e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/451] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 3028253ac7ea6d8aa771189d66070cf7dc9f4526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/451] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From b1e20bb66916932ff8fdb94fcf77659241bcb195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/451] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 1fb5e4444f067860c194944250a3e10e0621c366 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/451] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 5e56d05edd1191c6b3dadbebd989d5932ff8d0fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/451] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 84e78c4f9afb8760a3f9a03a790a470521fccd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/451] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From a4e22d8c6248be6e635243783122c6d948e8dfef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/451] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From f0a6c22768f098be9e46a64efde0e118ffd87602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/451] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 1544bf85ae871da51dca6a2d034e6bf0b31a31ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/451] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 31d866ec5892d3137399654d7865e91a0fc7b9fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/451] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 1e3167c0422edf520263183da9864945a7487d4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/451] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 059c4f1328a6fdaa4c18eaaf2a7d8646041562cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/451] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5e7f8f03814496a6dfbfa3f79bcae91e8222fe32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/451] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From f43a39c732f0b24b46deecf904bf43be9dbb67a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/451] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 7be1a35af8c2f4c617f69246b6e04abb4dfafe99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/451] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 173ffdafa25954b314ba01912be12836670fed73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/451] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 7d89b0028643f70d63af90fda2d2c36cbe3e271c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/451] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 9187fef05ffbb69e6b4771d89e59ad5cb901ca5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/451] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 63af1891bcfd3f40a149da3180862d23e0565cc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/451] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 1afa53ba763358af02fa515448192d9779d723fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/451] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c9b20c5748be072e94a150d9138036ae49067be5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/451] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 51e5bf997ed050f8898909797823a41d6569a3eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/451] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 7cdba09c96af04f85690f8f2d6afbf4c7b0be275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/451] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From b886957421e4a185824fb9f741000e85151a95cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/451] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 3c91277419ed510d5550392abe475b8ab46873b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/451] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 42ed96aabfa893ab34acabd26c9a3148ba687223 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/451] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From ca9e35ffeadca6fd239f7d5d78c10bfe63be7d4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/451] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e..b7905e70e4b 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 12131a6cc1bdec1966713e9da37318dad5d77f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/451] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From d03c1e54bf77ff601e38791bc2d6cf560f867f25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/451] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From d26427a120e6e6f9062e30f831f3ecc51d31e0a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/451] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 5582271e742318520dc26dffb8b507a7b2b40689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/451] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From aa30ce612b42e7e38e8f07901e51386a6d4ec68f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/451] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 20b27e621a4b22357e7cdf39e397bffc76413799 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/451] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 02d423b0c72800b5e0d5de91f2fed2d8252dbf10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/451] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 3555ba95e03b620652c5e65708c31c8e905edcc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/451] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 1d0fbf2f55db37619c25b112cfad485f05676016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/451] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 82e35ae0833c75a9ad95e1f37d0155033957bf18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/451] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From c97dea5c954888e6b131d0f660920faf10ea9cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/451] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 115f04a98c437c51c3d52fe11d279930ab9d9f6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/451] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From b82109454535832c8c231552acf494e897c94e79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/451] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0f3138038906d169ee573d577888e05494724879 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/451] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 6d94c018d92a67b507d4ef051129010821e150e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/451] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 86aeea5bd525e6b73dab35f1a73faca38bf5821c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/451] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 870aab541bf0df86e40c0d596d8c6da9277cf883 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/451] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 4d4b51887ac2bc642c42eae3b278b5aee2747b96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/451] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b0f468f6ec15e41578d38b90d8e0e346eee00582 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/451] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8a70ea4b3b155bd222db396edf5ba131b853c969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/451] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d2a3c359921bb676c93c924191ac225ba73d387e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/451] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 1b831d2242e4ede7ba49c98163b0f20dd628020f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/451] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 14047835a3a2742abaef25760400b51c6d26d4cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/451] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From f98239da52ccc82272c25ebd72b698520eecb7e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/451] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 6477806071e5843f65417e12b6e94cb657e7811c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/451] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 0df070f532ceb7a9a20f2c77cac419de20109f44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/451] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From d3e74bf4e9a114d862d2cc788fe6ed0bb01dc2fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/451] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From b8a2f40aeda5e247c32f6db9224b216d864b30ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/451] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From a81b1faf309dac363185fcb286f06d7b8c0bb6e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/451] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From d699d3c6f56da6ef751bfc430f6f20552031af54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/451] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From a996ab547734eaa8005da666d85ff8f6159b0ce3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/451] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 712ac9a139d90997366f2293e5a0a535e30b54ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/451] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 64e731ce93ea63286aa5cd87112fe329fc52ae99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/451] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 5e9d04ee287f0104182ccdeaa732cd59647feca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/451] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 7d03e2593cb0e32a45daa31cffea95ee2f670c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/451] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8bf6ec2a0d697a15082d2811bf02fe6030bf2e94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/451] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From fc49f8dc2f65ad9bf10439eb9225a02d2985737e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/451] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 3975188ec5683ecfcd7dd3ede8918d1d59789d2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/451] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 8a7c8f7d561fc4f0344472fec21b0790b7238bdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/451] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From a655f9988db97c44a090bcbf7b683a4399dcd436 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/451] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 921782378b515a239c4d62b79797d1bbdef1a259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/451] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 3c768525e4b46fc60c8270a1f8e65272157f99e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/451] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 301ad2111907f8772b02b7c5bd736a958bc37e9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/451] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 854e0fe94707ff90882c37674ea988a6fef14e6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/451] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 5b8c1e4e4f1f4c126a9cf5b103e2d1fa6cd03c94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/451] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From c8b264c181c30a8ad980e6e9b6ae444483902af8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/451] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 18f1ae7e64f425efb64ae3b77c8e455f487a9647 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/451] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 62fd8cef089dd5a931bcf0fe3749f4c4f5e2d5a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/451] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From b378a97e012e334c45d392b806fa78f97d13274d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/451] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 8d014cf702186808f9113439a2a8da402cbf0888 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/451] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From 2c4a1767fc8216693edc74fdbfabcb886ffeea37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/451] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 83c05658cc578a029b6a1e8290ef0dd8b1b6dee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/451] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 8da7579478477945b4e024b56280cf6e879af28a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/451] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 6517de213589dade11283e4a07b53d24739beefc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/451] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 56607c4e1c2868dd720dcc72ba1f2aa6c0cf5641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/451] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From b363e56484f9c2037a7745043439bffdb23c7154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/451] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From bce4d7b18340e126e089b893019793e7e193ab97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/451] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 1dbcbf7c0e580267c8c2b4192fc9dbb8fba3a3be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/451] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 03f358aea69b10db64de4e5376343b73aabdc564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/451] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From aa27339ab986734402dad101f6ee5c9a87e2345b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/451] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 297a83e31e81f2b9e6d010e0bf38ecf2ad5e0d30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/451] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From ebff393526954a9f18e569909d2f021c909c46e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/451] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 36b09976065412b26c0e4e31d34a2b146b277b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/451] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 3fad90d129909cf402716dd9b68b75c1084c044a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/451] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 9ae720b2471784a4e98933995b558019fb23a82f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/451] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 860304cd53440d969ee2a3dca11ac05c81b46bbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/451] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 3823e55402d9403eafe1733a9389e719ee942bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/451] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 510cd3b48fe605024c6a9e535210edadc62d4390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/451] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 040217c6c7e89edbfda147bc104482d96290e249 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/451] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 579e599cea1ade6b960a41d9d1bccf84785af7a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/451] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 1b7e04c861e02cbead2f4c8a8f6098f2cff895ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/451] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 3d01d707457a2ce63b373412837d90e81e27e948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/451] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From b4bb1207d1c2f9d85e8325f5f1db4fb832282892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/451] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 3d7fc654b892faed45238f99485023ada7890d7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/451] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 151a4a4b571d78aabb23c6cadeaff24a68cf40fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/451] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From bcc78b7416b34c654992a710c1a274eac65f8286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/451] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 504d16ad69c23091123c1edc87cebf7f7fba1b2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/451] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 033827194ec5dc665ecbb2c1edc9efeb871522f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/451] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 468e228592e9b603251bf2494b26b4eecb91d1e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/451] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 8e755baf240959cf5a49de07c77c9b35b485b7a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/451] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From eac644dd2f749ed95822a2450de3910ceb956c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/451] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 17a9ddc54e334c05734423f5c84fbea020f37024 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/451] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 9974d8c442c20c728c96754fbfefea862cf6fab0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/451] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 602d2f20d58c3c209d253f66869b5d0727c21fec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/451] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 02525d7f3faef716d3f2453c6417bfaa944b1b3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/451] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From d85b4b761d6268174cdf2687cbff6e04057c7ff5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/451] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 528f82eb0e0a9438df8e5574e4bdfd0f354225ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/451] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 9124dc24dbc0825961fc3f3b3bb54eed1eeb4281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/451] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 62a8510921d1602a1065249cfad39349444738b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/451] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 22a2e7bd90bf5bdfb6e5eac75edb8a44f76dd7b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/451] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 3cf9acccb5fe57ce66e2cafc22f9e7d0135fa967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/451] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From edda9ad5925fea47d8a0fc5ebcd152ccd8a144e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/451] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 06c517486bdfee2c36342ae930278173c8efa02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/451] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From b92dfed0049e322789ea1d3c253cafeb0dccb0d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/451] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From e67ab6cee372b7307031c56cc2d0e8a5f0bee629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/451] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 67a5a1ada118c39433f889d0b8e243137ff6c4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/451] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0110ddecaed561c6f9a457efd37ec5d272c2f4e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/451] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f53836f62c4bd7722fa0c4703e85e3f144a12ed8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/451] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 5dca5bfa90501116132299692342cc813db75e6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/451] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0545151af965e41d9cbc938862489bbdb6858099 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/451] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 8effee1c1c6bce14178207b2d618a52520844246 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/451] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From bce3bd5b167168663367dbdd45c23ed315286bd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/451] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d1b5b5a8e41eeef337abd8701d919cfe917a1894 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/451] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 86d82dd63840a84155199d59d1898bfacc3c2438 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/451] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0b8edafae1c6a105f2c08c952994c4f3bb76b1fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/451] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 20a02126f052750d542db92356461fc23d5f7aea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/451] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6bd079faf14921d18da9a17d9b07b741f9db9d01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/451] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 03aae73415e45ed58f1536b8b35c5d2b40913fe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/451] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 8cdff6192a7e51fd8e8f0e47a31074a85f55752c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/451] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 0796634eb619e50d7cb8e26858a55798a2a8d1f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/451] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 1baa77e2ed7fc4f11ddb0dc4e7136e71b7b53fa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/451] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 2c7562a066eb14d4320f63c5f774ac9026727832 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/451] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From c318cb5d31819a87708fb0a51eb3a38ba512122f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/451] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 07e1c6ee7051c26f606e1d8a03e0614fffa58f5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/451] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From c014263a36a97d2bf9f1329f3199f78b66da74af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/451] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 44a0828258ff4625ae4a544369625a05a49df741 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/451] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 73cbba81e262b08e17e0931c51acaf810498da5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/451] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From d7591119f7e62548361e080b1a2c58cab23402b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/451] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6f6851d7ef002f27d51d9dcf425fd8f511f672af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/451] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From ec9bc0a689083d706f5c4e28d4631c4a1cf65415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/451] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From de6c1c23f393584ecd16b2b1aa7b40929c9e7d35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/451] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 9c565f7f2b7797aa63138c7febb28c9ea52c7213 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/451] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 590148c2edbf7d9a28217be38950ba57282480d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/451] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 35e515ef3dd1e1b50d4ae503ff1b9175f852dc04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/451] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From ba1a5a4dd9efc376e8592fc2a73780ccedbdbb6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/451] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 334f1ece021e72e41005036dea203fe207dc7b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/451] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From a259acc009d81077af40f3069d7317fcca702804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/451] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 30559d2d5aba18434caa11b40fe753bb9081943c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/451] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 26f8c33f0639b2a4bafe847e1a816c12fe572fd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/451] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 2bd107108015538ff3e6966efdd7269ef168ef36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/451] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From c1fde281cc47477b97a4b8a124c5c625af1c5a5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/451] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 0b01ba6eca556d8eb84d08f7729d21124e9c4c2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/451] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0aaf5c2cb8f83d20ae04f08ab54e229087505885 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/451] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 9ad8b336da18cc289cee4e79a347ce85771efc8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/451] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3bffca01f9c55684b3364bf16910fadb6105899f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/451] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 8217a81722f1073a178b8ab036e64d556ad38461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/451] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From dec66bfd0b77ddde9f891c0aac700381ab831da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/451] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 9a917ac86ca2c102e8b36be92df5461306bd8c57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/451] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From af6a37597a65e08ba27d477d6ca91a48585ff459 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/451] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From ebe52c0115b26af9e019d06eacd53d5fbdee7273 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/451] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 638344e3005290eb91869fbc951e77b033820440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/451] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 15049f4f16ad4a41b7ef7a3e9f7e29bdb9c2b32f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/451] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7fd83bde3f9c716b3d7de20b193b8f70b43a4539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/451] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 5bd33f4c4aafc9bbcf9ae373bdaf9e7663b7b947 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/451] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 85dde27ddad2de5212ca0384cbfc41399f330667 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 359/451] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f1b513a5a4992141bb507f713d132d648be933ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 360/451] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From cae134ebc73207fa6d567156f92c35652ac3f47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 361/451] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 4f3faf6fa1d48bb3079cd0f123d9e2818a000ce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 362/451] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 123cf03f44b272a8792270dd29f4a3266bc0289f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 363/451] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 80555e1ae58146c824147359f5c5eb8aad057f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 364/451] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 8434d1c6196d822d8dc5b08dab0de0d473b75521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 365/451] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 19e085ebc54f1c1ceb2e3f5be1a5daf152fd7013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 366/451] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From f80b5895625496e5cafb8cedbca048144af05f18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/451] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 04dd31ada88a9c66e1fd0235b48e8f1c44c22f94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 368/451] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ef71caa24145b47d40fd657e7bf72ccf193fedce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 369/451] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From a028f712c6cd4d9e2c72c13b22b85188bf0b58fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 370/451] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From a2edd1f6f42482a770a8538b4d7cd001fff177be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 371/451] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 2c3088fcdba0a68f3b8f35a727b1fcc25dcae672 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 372/451] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 83705d98849fa4fcb9f7a8904cc3f24f82a3566f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/451] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 0fb2837ec5d8490dd2acdfc99f719e06b0a9ea24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 374/451] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From d76240fe133c36329e1ac0de41019211deb46ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/451] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 08f0489251afcde3993c9dba82db019db233b9b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 376/451] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From fc7fe0d3af512c0433634a9cb4737c167e8937ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 377/451] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 6ab24d369418ad01d8347013758ab53aeff769dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 378/451] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 121ec2a8bd6010ba0853758e6130ba931fdd9c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 379/451] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From e3a54c164de5764bd2a84fff9a7c0888da07593a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 380/451] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fed54bc38030aca579235fcbd0b357f633027daa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/451] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From de71496b7fe30c8f44429fb9c31733d55f5a7c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 382/451] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From d35b2047b356e884f653bd26fa293f4d672afd79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 383/451] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From a96662031f09c4c24dbca1a39a1bfe8af1d93049 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 384/451] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 58aaea54d936185abdbf4937483fafa98ac06443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 385/451] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From fbb8230e6e76c7eb86653d337359a51156fd1896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 386/451] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From c2ca689c0e5ac325f5ecc986223b902996cbc407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 387/451] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2a8beddde5f79dd3f5a36b311d7d30040980eb70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 388/451] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 4ad58336a9b5b1d2b018db0078a939e70279ad45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 389/451] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f648a6457b690c7f458a29fe88fe8009ab7fee1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 390/451] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 55436c1577ab76c1bf2336872535b22a2ecaeb71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 391/451] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From e85f646c467ddaa2e324ba74c19843806e4b0593 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 392/451] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From f870642c185db930a55db77f37f85e92db8390c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 393/451] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From e5ab674c7cc3317184973265ffcc2d35f96ba4b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 394/451] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 359775578f4d68ee3a6de71f7f44455f05d6a49f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 395/451] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 4e98d3799f07b05b442e9080c251c53a31cf80b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 396/451] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From f4b2521a5116bf1c2c918681c76f64dccb8361eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 397/451] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From daba93717e72b8890b823187efa19ca1833f3414 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 398/451] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From fdd2f4197621675a77c9e9ee9ec9b0d4d4ad2cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 399/451] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 52f043c9d76b1ec317b09bac226bf527588464d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 400/451] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From aca69fcacfc9a1516b7d56c7ab82f7d070de28c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 401/451] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 73927cefb210ee54172586d87028eefe17a3e926 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 402/451] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From b829ac42a2e116affb76b162fce7fbe8a0b2b939 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 403/451] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 686e40f5ded77b989a6aaa25bca73a5255f5cb18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 404/451] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 8202f51e5075c5ab9863c61ae174a096f62125d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 405/451] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From a30c7fe59f000c0d9a1c981aa29bfac5d3db3a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 406/451] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2faea23e967405862079e571a549331d394698bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 407/451] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From c4a32affb6a2ff603384fd5f84f69c84d6cd3031 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 408/451] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 044c09ea02f6af8f1adb832d8cbd592dee6e800e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 409/451] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 47da7b0b5f0f03694a5212c7ad36fbbe5d4d7989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 410/451] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 6beee8533198682dab98e33b6b999c929e97be2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 411/451] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe4576ba206c5258becae47c38aec2964e7fc3ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 412/451] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 880b01995f81ce775dd6cae4b31cfd1275c1abb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 413/451] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From c27871fb6168f6023d78e2a4dee46f00c14d87ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 414/451] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 02a40c539f79cec1fb08ad5c26b646759ebe7e82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 415/451] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From d6897ead6c9a1a8e04bb0570a05d5825855c1d17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 416/451] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From aa8d2f6b77b44e194a7bc3fdae323a32c0b1de03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 417/451] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From f935187efc0b5078a815032733453c1f8d86c5e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 418/451] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From cf5156e98be94c70e304ab8c151720fcab6da2db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 419/451] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From ae9d1e64e408fe1cb09655541baf6298e47daecf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 420/451] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 54da6f34ebcff1ad64eb3dcd0302b8af25a3365f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 421/451] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From f22b80940d7e13425de8e14bd97602d72dd61fcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 422/451] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 32ee359cc2bacb3e0b77707771fa27bb63fa3026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 423/451] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 3fae4b26a3378d84c6be1f56ba08d74deae2640f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 424/451] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a0d12173d0d3f12c567d2c9fe00ab8bb235ac1f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 425/451] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 84e13db9917e78a8d0cf5013a37554f615a434ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 426/451] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 6d5c0ab42d162109ba22d1de520e7ef95d55f0a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 427/451] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From f956de97304926583e101747ab73c852c42efbe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 428/451] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 6959ded67615dccf19ef6b45143bc3181862a0f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 429/451] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From c327383171e0757a1b895e0ad9ab92daf656efe4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 430/451] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 59c58b5405ccb0254a038843500554a7aa463be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 431/451] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 23b3a4e37f7b80df22df2160c2de2f7b76655bc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 432/451] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 666aa68516c5b29d5175714211786cb485b73b27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 433/451] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 52b0dde0b0500cf8a571e647366ef9361632e65b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 434/451] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 8179dd47bdc02f6f3a9b1fac475b9895b0388fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 435/451] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 94ee4f305537b22a594f86f672853ca0ed529883 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 436/451] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 14668d6ae2c0401ffc38a5a91b1f00bfb418fc09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 437/451] zou: rebuild against OpenSSL

---
 srcpkgs/zou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
 revision=6
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
 checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
 
 pre_build() {
 	cargo update

From b6e3e40b0e8dd9241963446ffaf36916ed609e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 438/451] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 447750934c35362e4c2038ebd2f4de3faa56fd42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 439/451] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 34b8309b4fa4a919e4f80c1a695c0296a89b5dc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 440/451] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b3eb46af37177686f46a72a44017b22d7ec3db96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 441/451] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From ce8a5a344dc6e207af3fb25f5dfeed021b92b732 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 442/451] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 183a3f83e8c811c171d192d27ef19b06d367cfb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 443/451] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From fff165ba1bae30156b7fbe20d5fd3fb3e66a25dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 444/451] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f5296ca0f32a724998b6bd9459e5bef000a2d11c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 445/451] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 96f2a5dd4a80e28b6c7f2affacb0861e979c7b6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 446/451] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 87e2f3078df11c11e5ef843424ccd624efea2018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 447/451] acme-client: make broken

---
 srcpkgs/acme-client/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
 distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
 checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
 
+broken="Doesn't work with OpenSSL"
+
 CFLAGS="-fcommon -DHAVE_CONFIG_H"
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;

From cd466eea270766ee7f1ff133f9eed42d0914a6ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 448/451] Ice: mark broken

---
 srcpkgs/Ice/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
 python_version=2 #unverified
 
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp and slice2freeze
 	hostmakedepends+=" Ice"

From 71fdc01c4a9cbf373adea2c63f31313e5998f6da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 449/451] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 86a02d15e973fed4b9c18a12ce3c169a880d14e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 450/451] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  1 +
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fd0328005a5..a557ddd8e15 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -220,6 +220,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

From 247301da28ee4eace5823286e5ae1af3aa4ee892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 15:42:01 +0100
Subject: [PATCH 451/451] mesa: fix patch

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
index 8228101b2e1..20b4bc23e94 100644
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -1,33 +1,34 @@
-See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
-
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h,
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ -	2021-02-14 14:36:02.838935228 +0100
+@@ -42,8 +42,8 @@
+ )
+ 
+ libintel_common = static_library(
+-  ['intel_common', genX_xml_h],
+-  files_libintel_common,
++  'intel_common',
++  [files_libintel_common, genX_xml_h, sha1_h],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
    c_args : [no_override_init_args],
+   gnu_symbol_visibility : 'hidden',
 --- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
++++ -	2021-02-14 14:36:36.898986675 +0100
 @@ -57,7 +57,7 @@
  
  liblavapipe_st = static_library(
    'lavapipe_st',
 -  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
    link_with : [ libvulkan_wsi ],
    c_args : [ lvp_flags ],
    gnu_symbol_visibility : 'hidden',
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
-@@ -39,6 +39,7 @@
-   'gen_sample_positions.h',
-   'gen_uuid.c',
-   'gen_uuid.h',
-+  sha1_h,
- )
- 
- libintel_common = static_library(
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ -	2021-02-14 14:37:08.623233120 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],

Re: [PR PATCH] [Updated] New package: openssl-1.1.1f

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009  ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool  ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 556128 bytes --]

From 5d453e3cbc415b4175849c35d1aa28cca4417a1b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/447] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c..099944ba555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 9da0aeefab395c0e8c925ef774508124c19e81eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/447] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From d0de40fe47b63aabb600056927d4deb9c1735170 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/447] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 1a521d756b01c51532411f57bba31b89124d8635 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/447] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 74c45a8429023b03b02f66302b6996061a3e10c5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/447] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c48516a0b444b99c6d9a074c93c4ba42b945076e Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/447] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 099944ba555..3b84249d9c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 3c981dcdb444245267c4e597e101f10f16c795d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/447] libressl: don't provide OpenSSL anymore

---
 srcpkgs/libressl/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
 revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 _lssl_asm_ver="1.1.0"
 
+broken=true
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
@@ -64,6 +65,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/ssl/cert.pem
 	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 
+	# Provided by OpenSSL
+	rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
 	 libcrypto46-${version}_${revision}
 	 libssl48-${version}_${revision}
 	 libtls20-${version}_${revision}"
+	conflicts="openssl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 204ff4e97ed8eb677e0cb114f7fe4c9b45e56b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/447] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 2a85f1f260f883766712f6365e9241f31d267593 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/447] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 49b98d89fb159445be0e469bc6b46a038883e686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/447] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 49efd1aeb7ed006119780cf3eac3754fd15ee705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/447] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From ca5ff0d231b8b3690be08252fe019172f602e520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/447] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 79f7b8b56f5cd38314efcfa08ea9e5f6972bb400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/447] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 7daecf1f352820dd63fd8988aee82755ddbd1826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/447] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 8a0d7c21128e4ad642614e1daad83b65ae92ebf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/447] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 020f028931eafb48c04ed32bfe8c82b9fbe2b525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/447] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 031b551ed6ebe3e94ae6e72b89b8f7e0c577ef72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/447] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 46cf6227aa561290dd72f787c904837c4f9bd80c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/447] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e68ea2d7fab8300900c8400c86e392b4c1cb56e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/447] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From cbeb331c4de81ce5d01b27623fb93a329f1f0ca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/447] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From d2d73bd399b011a0011aa6127dfd1bc0beeb4eb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/447] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 37c92abb8e179ac343c034b291ecbd2a57b3110e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/447] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 85aa40b6bdcd2cdb5dfebc94eb80fe8c1eddd907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/447] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fe5099250b733246c244fc83c9b6b080c7ce59cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/447] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 8c01c8b5325af405818c77707cadd33dffde3081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/447] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 728a4f57790c1dd108327da5b6e8ddc9c9c9724f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/447] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 801aacbd28b7e82527a1261f956919d1b8fdabf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/447] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From f671c93364c6dddfba9237b08910f4c0c0af167e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/447] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 4d3bf4b374346e9c087882bccdfc8854b1308149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/447] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 21492f8fc1624785882aee74b7a26ce66d0aa727 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/447] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 4ce81bac6c4155389fcb12c710c185b60f43b232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/447] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 5c8ba6308896ae2d595063fa7640481f4b04fbf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/447] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From c46cabae12239ed57b39de5c661f1b37d6e6fd44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/447] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From eca98dd5d8ca33a690c78d8e7e1d485c7b342936 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/447] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 2d52ca70d29e9e70d0c2298a62c88e10e428ccb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/447] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 17158189f542159b38af63373dfd4b7454290836 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/447] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 3412ef359111f5f5add867176607b7d10e6192fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/447] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From f42df0c247b39bd8cb2459ac60994b4a7eca6b0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/447] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 05072fd771c081fcefcc58a301e69a4434695f0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/447] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 6d004b067a82db15e839019e3875c65dabbbe7c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/447] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a57397940ef863f812832fbd848f99fe6d8a933f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/447] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From ca12228f649d0be38103dfedc38ae77f10685c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/447] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d0bd4e4bfdc9745c14699f6fd15ee0a6bccf08c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/447] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 356d9a062a3726c6c0b2ac037744c6034879cbc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/447] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From a005e5163e701943fa181e7bcc5f9693dc68eb93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/447] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From c14461661f6be9c0c94a9fd4cef3cc407940be59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/447] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From fd7bbb61662abcf07783e41ef1a0d2c9cabaf4cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/447] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 937d7f3dcab251667fb0b4dbdc22889105ff85f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/447] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From f9496bd7b00a02b8f3034582e36e98530bcdc6ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/447] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 625bfce9ff8024ca8277a1f3257156f1fb7cd35e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/447] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 4900b0621a3a53f6056e15bed95041331fa05c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/447] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 45e124e60f3a2ec2797f462de6c22e814fe9deaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/447] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 16e11fdf335bb5d3b47280b83507ce1f15ea98d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/447] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From cf558f79efe0a01b12d0490502ae18c1a4748776 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/447] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From c9b2a25cb426790ee526a8f0eabdcd5880f13610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/447] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 758945176545ecfb2a744947773d2db54975330f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/447] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 93641aa867ead9719b0d4d297a727e01c10ccd3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/447] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From b05c287666b308c1fa1b3b971c1e9d32d98aedf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/447] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From aebd04597ef26c2f108655638d5817e3a2b70a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/447] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From d1c2abc11a5fbbc397bdfe914aa5667ec8ea6967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/447] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From d3a5a84c622b71e6974ee66e1dfd9b88dbf29063 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/447] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From caf2ea5c7d3b41b7936212e0a22f3b7add2a1857 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/447] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 82491e539e36a79e80d025852c4500c80a42201a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/447] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From eb13dec6c4c4debd514562b9a080b29328382008 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/447] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 6aaf7fe91393bad79f7ad18d6fd99361faa83631 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/447] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 5e2c343069337c63aeafd94d718a43984b61350d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/447] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 98dfd94b14a5e64dd9e20f65e9391f654a1420e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/447] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From e28baf4f63d5dce607cb0b7818d538ab9509b72a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/447] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From fdc968296b0b93cfaaa29732cfaab1046a4e4302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/447] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 93595eecad59c8c7788b3c66c962084fd6b5c184 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/447] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 0ed236bfda2216a9353c8d2a3813eb2de7005901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/447] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 15779e12e527ef7febcec0959747b5a75b253558 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/447] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 3795afd7513acaccac0ab8b41a88a47c8be521dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/447] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 14c56b39580210d9142e9f0ebaed8071da07ae8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/447] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 781e675a6fd09095ee88477aad377585ed528226 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/447] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From bfc2eaf9e0457921783a529a8ade1020527197ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/447] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 785714d57f0d78b4ad3ed18281ac37e507ca6b4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/447] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e39643ae23a89a001d566820978855ebe3a872aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/447] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 74dcad4fdfb9674e57b568ac397172d10c1c69fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/447] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 8098aa687064239f58431c13c2cc925276d83d02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/447] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 8b7acb524b0fb3439e266c8fb737ec4930ce9fbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/447] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 0f72cbad1a3c583fb9cf92c069b8f879e79358b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/447] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 04284b3a7079255ca2e9120abb8897632d90ebc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/447] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 75b22cd80715f70037a84744f6fb94485f5bf9b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/447] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 00375d60e6a882bc61f4f5de28ce35396d0fa320 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/447] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 9b3abf92fb26b7340541ebe59baae74e4c8ae515 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/447] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 220a23ce8c0cff2ba282edc4b00372f5d407fa6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/447] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 99dbdfbd448ab4581b39c6620746d544ef6a2b3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/447] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 8bc9327185e9a86a172dd3032fe225c285b3c62a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/447] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 03a33bce0e219eb7b66d0f37c8ac0878ed1c58be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/447] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 852ebeb684686506e422895f919ab623665b34b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/447] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From de6255676d8e3cb069ad66d94961dd99eefd2d06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/447] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 76480d26e31d627d57e874bec39de7505b7fa8d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/447] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 2ed7fbfad0423133777ebab8994d6ab6ab9014a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/447] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e49e5e7672046324ddf34d3fc506ee7d0cbc63d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/447] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 7fc4873b617b6040b13f81112f628d64884653b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/447] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 55cb2518f8170085e2d93d1eaeb1187057b758bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/447] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 9bd8954301dbf021a81ff363c712d56bd6451e3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/447] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 38f752031b8a4d443f3fdaf8d17ace8282c2cb0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/447] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5f40f6737dcadc375fed6da16b0507cf5a9f91a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/447] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 3377da53769c87265c2ba31a83832477c8344716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/447] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 2d8f5b05c08861e90a46a3cec94a2d44c3732748 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/447] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 930c670f5ce9b6a2c9c1ea08cf65113d39cd696d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/447] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 6f072cbd57cc5f49b16f3d9fbeed48a432fa9799 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/447] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c3ed3173e119d84904f55c92c21376f737071653 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/447] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 3ba3bf9d4e796b5c1df930dc15be645b2cdf99cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/447] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 42dc93c82a1b702510c8a652205b3647f932d9ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/447] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 71a713c686a48bbc24708a0e5ed0904916115ac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/447] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 31c022eeb13b62c143e87772df6c6b49828905b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/447] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 88a3ff88ae25e647e8f430fbf030f9128dcfaa0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/447] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 286bf04d33ba297435224afa02a3a79ecfebd1d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/447] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 9927c270c609ee188e90c13ef205fceab0474abe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/447] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7308efc7d80858e0ac0e9ae65d8b4e5394c1fbe2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/447] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 2bccb74d587bd266efd08d794d2c3af47950e61e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/447] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 617e9a86d6d2978b7ba634424f2b91941f044f77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/447] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From de081f11f2f707a6fdb4d25f15f3c1110c64a38c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/447] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b8f2073f8348587e0a21b9206f592177b0419a73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/447] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From c2f98106676471d9fa1ec8d29cedc102cbef10e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/447] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 45e77c3467caf297198fe95593f62e1ef2ab3fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/447] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 028ba8265fac03bc0ba0f146df0458e08578634c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/447] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 6589f09cc8eda9a2d81acb72a6aaf5d7b7fe0f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/447] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a8d87de281995051b4136e2db6e1acc1d604b20d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/447] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From d5ee9e44c548b5f3943bd6e94149a6a6ecaee499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/447] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From f190ef7eada74845ca2980230d1e811b3541261f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/447] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From d4fd4bb1ffded7f9b07e4d987ac265a644d023b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/447] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 67cd67280a665d0a7cea363ac5396833c42f7a48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/447] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 338ea216ff709d46713ef44f439fcd4a31327901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/447] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b8114490a18644dc1b33e0dde44d5a2eb67b5994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/447] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 85960ce0c80a2f521619d225aa99a0f262ad6b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/447] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From de60cd8be6cded37b2f52e684f1ba4ef48eaef9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/447] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From b6a8b39a596df32202eb7295aed9ede46b325fca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/447] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 07174c550e82cc3d329cab9257fd9ec25098e0aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/447] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From fa79fcec3432d97a6c888b231d4d2c98c1e59aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/447] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From aa299d0c2baf67aa4edfbe0f7596f9b99f0016bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/447] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1e127610265b5a2309e5d3d84610b00e612cf302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/447] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From f14fda709486fd0d2f8702325e449f1a49a3fca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/447] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 6bcf176a94b8f1db9caff37e573d603cb3066af7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/447] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From c9e48c21a5c149dafcea8643788bee45bfbc8843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/447] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1945170ea3a6b40ab955200b20c3c2c3345ca349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/447] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 10164298fae83b988a809f02a2e888e4be312687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/447] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 8e7a397da917a7046075e8bd0ce1b1a55b2b7813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/447] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From b479c34c0450256a7d4b6f2d1bc451a4cc34a7a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/447] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 83406c213b36291da5142600849308a892c952cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/447] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 869cc6451a041e295e8e391ef7db92d0abc4c9f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/447] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 480795a82b22645a85256262284cce937b547d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/447] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5fe1051eed2e60f8eabf5f9b2b384d4f48f4dc92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/447] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 488b10b36b8ce9523d347000b27a291539ee0065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/447] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 9f8d0ac149a3c5e931a1e7f35b8018f6afde4a04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/447] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 638a972229bfc605b5c4a4057eafc506ce0d36ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/447] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 242f51777b073399694b1ba50f8575cb84b614c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/447] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From b83c350de841cb5a10d7354bf34b77e1a45248f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/447] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d2c5fdbe02d4555b438411a6da3faa62a14d7d9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/447] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 5d154fa8f7e576205db788665f2780a7884b9cb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/447] libucl: rebuild against OpenSSL

---
 srcpkgs/libucl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 08f33132eb0ad454b37ddbdd50e99bacd3c1f608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/447] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 1d08840cd8b60ae24c3df3b6394d47aa4cd91a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/447] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8ed53fadf88244ce2d5f5b6d637d0e545ade0034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/447] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 1ef15fd892f4de38d5e8f8ff2e43c3999af25783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/447] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6813b35d1de02a6c52444040fcf192ab279c0784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/447] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 29454c865f2f857b87fc7124351aa86f80137f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/447] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 2ef1cc2da91f78c37b1d1cdd3b94fa4ace933601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/447] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 4dd2ce080909704879f2dff0dbc3f0f25f2bea3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/447] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..92ff4241b68 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From dc1351219871774cb2f63258725583e2ba19385e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/447] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 55ec34a549fd15dba7106dfb4dd0ed68e2b9040e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/447] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4bfb811202391366fcf661f0d5fd6d150ed409c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/447] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 3d13a2fd010d0cc1d922e06adbc772f05041fcdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/447] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 3b09cd258348b5c728f611827d04461649794a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/447] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a98eeeb06ea7df3a6486624f09434564710f5ceb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/447] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 833edebada493922bb12c3b971844734f3651749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/447] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 24b7617d9b2695b83147bb4fca650c140f24e1d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/447] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7318966926846e20d795de2b584848fa43ff2212 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/447] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 285dc9e1485bb911e678c3a77d3e8f2db11ec3b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/447] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 2b8f527ae7fd03d3f47800f5c591ba5d1399f736 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/447] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 8a595371870662cbb8dc8403ad074a1fddffd89d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/447] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From b0ef9c13bfb276e2b4ff18983d8e3a9ecda4d91c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/447] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 3cc91e42a02744de02ff63c319066f1cac6cb73c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/447] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From bab8ff615475770e4cae21f150ff2bd9e92b0592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/447] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 5da0f44ed6db0b956b0f7bd17b83f40914c8a360 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/447] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 3ede56db8b31cfc396c384c371c7c401e60736df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/447] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 5fe355c2eb1239edd8e929ee651f101e1f4522fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/447] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 33692a8733fda5eea45cf14011a94cadf69876c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/447] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From fa8d20eb06bf6b9de56f2fc5daf40728a67fb434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/447] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From d7d004049328c3541de50294b601071c26b575b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/447] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 08a60c8b36a5603dee96adda0c3deb4b1fd10180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/447] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From e80befd54dfec7655f7d596632f69b9c82d0d9f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/447] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 7e7ce7a2d62eaa98a203b72bf670bbb17663f1d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/447] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From bbd5d2b932daadde34a2d76d1cae7ecf1eb4cfc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/447] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 2fbeb6545a5e5b3956780885e62dca29c7fcbdb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/447] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 08a9d9aa25a80528914f1625216154780b639847 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/447] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From a550265514abdf022014a0d25a100c7936dc5693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/447] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From d50f689e359d6a26b3934e98927ed5a80c23fc1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/447] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 978180a82cffa7b7db945bb4c05fa08ba9bc90f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/447] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From e71a925f75cb770ce51466d28ce8e1ebfd939cfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/447] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 3af129ea26a11523d8781f67bc78be2baa770e12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/447] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From e101436de02f2f00e081b068da51c12bf99c78e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/447] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 613b1110fe543b987c73f316984459058f2fa3b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/447] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From b981ca24e038432ae8eca82b087e0927d880138a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/447] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 802951b8e472c28cbfc070d7f9bb10204173107e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/447] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From a42d0f9a6c191e197ac78668d4e156cadc1d6aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/447] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 388f3fb1b4685a0d371188e0f76e09592e208ce3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/447] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 1145171b85ff85f4e0a8cb48907c8fdd6adea368 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/447] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8200a402e202cf3b752244c567521dbbd7697d0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/447] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From b714dd0b2305eab89b5f968298a2d2881b8c8429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/447] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 10b7d168281dca86fb2b0562a5c7ab99fd725444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/447] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From e2b0bafcad97366bb131da0450a58249d184f5e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/447] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From d4f5e12717b355949edda8e0f29bdda66dc810e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/447] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 66fcfcc9a429a8c450b74a1355742ea727f913bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/447] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bd3f1e07d7b220bc42df8861b3c1b23258f24ba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/447] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e511c98d9f0f09ac9a77ebe487053a44a6d1da4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/447] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 5a8665960ff21840cbea4631c8f7dea9ebb9129e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/447] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 324322fbe9353be5d06f38da5e7506bd32f9c3e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/447] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 0ed5b3b674256cd1c9e5ae795138bfd6103e77a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/447] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From d9f37295b95a27d9c04e3226b2004796e217068b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/447] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 42a9fad4271c442d443d451b9e6a4ccec17c1761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/447] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e..b7905e70e4b 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 845df395581b1751b5f3c67a94cffc3af5724989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/447] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From dd07ad898991b2bd96fdc7b7ea19b0966cea1935 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/447] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 53ef55468ef403a4d1f6503f3e292b095035beef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/447] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 45a4ee5d2d7a9bba4ddc4887a2c8c19e8e783bac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/447] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 97013c937a58883ede21e7e9caf5697899a03bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/447] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 550ac569bc144edc362a77b662aa16ecd52669ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/447] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 5a09c2147f07120f07d44312bcf45ee1db9be4c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/447] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 320f5610d0e0a2bfa0b51ac18d1e0ca261a9feee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/447] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From a9321375571f00ed4d2f2660a21f0008b3c10393 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/447] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 5baa204ad14f11f5e6cbe0f8fa1c2fb72de065a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/447] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 7c6385e5be62146e2a4aa70eeea1c121b06514b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/447] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 0646eb42b499d9ad6d966c4e920a90ae64ad32de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/447] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 1bc4852b0454641079a81aa1d188a5eb4c4664ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/447] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2303b0faaeb9170d8044fc7a54fe295f05e40e95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/447] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From da974c55e490658e8491cc5527a7ddf44eefc87e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/447] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 763ed699b1a45b075b249622189378c7a03bab66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/447] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 29ff17cf51e69bbafd6effa2ec4a26833dfc52f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/447] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From ec1e0ebb0371be6f2a37ce5ba286ce078c4b7d51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/447] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 823788c776d43c9623bda366266236fc6eabd822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/447] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4c42c4f894af9f5507320ba2b4e25d39229e6534 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/447] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d874392fa2a72c9fd2c15ab1686ab9ef55d1781c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/447] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 64eb69a0885f655312b5074325692175451e4a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/447] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 523a2cb23987e9f15efadc133e4437df8c1b1479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/447] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 6e66e1c47a4f29d11ac7dd97c4e047cc1eae9bfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/447] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 8af07f2fdee7be5a9c994f6c434c2f9704742016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/447] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 05963c495973f84d109178f81a7f1e504754a5e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/447] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 5925b8962739c1fff3f2581ec71da578fad3b34b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/447] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 41940d8a8a15ec382e6a42126571fe70a92aab92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/447] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 8991eb0716d61fcf353765f72a47fa5bceef983e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/447] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From c4efdf8f48d6b40518c11f5abf6e23e07c70f2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/447] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 60b91fb09672ca42cafd6d18972874a99c2c260e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/447] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From ac4dc9936224407c7806e1ff3ec599ce5a9cdabc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/447] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From e6b994a25d9a79c1cca464abb40b28f065d49ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/447] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 436ee235113bce2bafa862a13b0961ca934074d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/447] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 12898ca631ee8e7698768ff03be8b211561e4a70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/447] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From b84a08759bfacaf0662e022f159106118451f235 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/447] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5955a4083ebcb49064c35920f48eaa42109e3f3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/447] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8ed6fa8f64126fb01975c4a1b1cc3794857ba8e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/447] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 9c8d96bbaa244432a615096fc5d8ac70295ef21f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/447] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From d0c6630ed34a59d68807202cb54fbbef5df3fb44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/447] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From c4419a31688b313247fb23c0d3021f530eb3c175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/447] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From bc17f0020a4b7c1ff9d488a26bd51bbda9acb969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/447] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6359be60b566ab61198c171c9bcdffb9bde2a898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/447] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 5377e2435d3cc57847a7815a1d6b338daeda1c5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/447] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 8fb753ad88da7c0ce2d7155537b7c7e5d5e9fc51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/447] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 7415161f05449d6d78aa6a1db2bd7c55fa84295d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/447] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 13c278a0ecddb56df680936eb8eb90f335e9f29e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/447] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From c31eaf8aef2f8446183f8e34dbb6d4ec9884b163 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/447] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 2943e6d05fd9132dd099d4412d7f2909886d8855 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/447] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 098d4957bd1f7e2c96a7ff6d8f3da5b65962bb07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/447] qupzilla1: rebuild against OpenSSL

---
 srcpkgs/qupzilla1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=16
+revision=17
 wrksrc="QupZilla-${version}"
 build_style=qmake
 hostmakedepends="pkg-config"

From ef1deea45081b0531ed023488ca0b18aa241d1b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/447] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 10a6684535ee4c80c912775aba46965efd713346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/447] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 14152a195019771a4cc55bbb76d6235561927fcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/447] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 0a423be0e09d434cd13babf3592262606230439c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/447] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 92c8afaa947c4fb0bbe008345dd346ba19657bf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/447] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From cece39209767ee0c210edfcefdffd5581c5e2dad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/447] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From df4b954dde5041afc0d0ec48618177bc80cf91fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/447] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From d2fb7b71d1d8268fe023ce0a797dfc4c25cb3139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/447] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From f05c3b5a23d7fd6551235ffb7831ebc10f20cf96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/447] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From b4ec43474c69c4c08f00efd03e659c08352afbb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/447] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 9495e573f64691e2b2aaf1fb48c9f451ac03affb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/447] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 66d4ba80bc887d64d78e2deca584eed7321357b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/447] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From ce7e0909c56d03081a1272d963f4ce954838a0dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/447] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 40d434640792c3602f18d06d26f82b9df534c80a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/447] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From edbe595a35f52d1429e717b928ddcea959081af9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/447] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From ee9534dd22be65e3d733e8d8eb19d383ddf15eb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/447] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From f2eac405a1ccec47a71b8d0da876a26fab2484e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/447] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fb8c8635e6a12fdb5b9ae15b9ebfa6db7a390b54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/447] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 08e67dee01571583782292f8f3204e0784730ed4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/447] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From a961e973007cde4275d2ad692dc433548f21ba4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/447] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 4668546c75d1376247fa8eb90cb5c07a7b2c42e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/447] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 62c24925dc3b789809b802df107cbf0d35da10c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/447] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 513c2d88cd441bc4d77eec4535331dbe60a8e46a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/447] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From b710075b1920602f7dd6b1d0a01d27db3498488c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/447] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 309d95e1577a9f1661a7d06a9cc4e4acfb5d8e13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/447] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 038ec601fccf16b47f47cfc8717c412968f57a36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/447] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From c5b78ee30b45632618fb9cb49e7d263f26aa6af4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/447] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 936d4161bfc1089e4237448721196a983b931630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/447] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From ccb01f704ce9dbd87b5be8a6d53951ac694153d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/447] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 0aab83b41ec37136d852c4fd38da4f55c7a58318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/447] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d1370a5448ffdea88d5acd8c531384201a139eb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/447] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From c297f12bb5305f24326605143c84860db9289b9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/447] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 18af96adce15b086ee74cad86000cd28f0cd1f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/447] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 41d5a8341edae8130112efb36ea158755ac1441c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/447] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 2054d36808d2de35ddd76fea6af59940675abedb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/447] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 2fc9e9c04358bec902bd9e1c330f389efc8c36e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/447] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From dc4243b3641a5968637cf6aa6a24fe182fbf726a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/447] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 2097b037a1dfc3f06f5189fee7b687e7b5647bea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/447] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4e30643d9973d8024e8328a6f3268f3cf44748ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/447] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 96d7d21995c90472d93b3f9b22cea27cd7c3ba68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/447] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 97cd20fdf2aeb2cbfb5ac33ea24a730b51b32a41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/447] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From d23016f6ff86039c67aae1c04a4a6d9e345a9576 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/447] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 545b069b6d94c1f933b77da79c5f9abdfcfbb501 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/447] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 7cf08233f1b46c425fed9ea6f8dfa2e159ef8dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/447] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From f10ffcd6c03f210c2f5ed17ab022756f99c83ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/447] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From d1a5231d1497b9d580ec910ad315add14ceb5b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/447] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From be86643d18ae8c0219c03269b50c821d628fc3a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/447] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 32f4bea844aa7c50e9dc9e881f3c5596bccbc5b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/447] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 89d93b4f2ed21d0b5140f896dfd6ec3b9fca87c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/447] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 778cb98f60b6236a16d9dc2acb0f69ca0386bb94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/447] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 9fe749ea198390388488f054df90fd81d837407d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/447] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 28209f6ab9997070e38df98dc3eadc17bfe29ef5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/447] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c1113fe3045fde3e8141414ac7c44645722678e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/447] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 02ed7cf3fe8da87d945a6a090d3ba16fb0cb76fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/447] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 95e2416913bfad5fb8e9c0e606fe222fa24e21e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/447] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 11d283ad783f05a8f7547765f72c67ebe30549c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/447] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 827386794918ebaf2fc8b2d2bd0ce32232142f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/447] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From ac44e1dea42ea27bad0524179e401159d9ff3e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/447] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From f8a9878ca92566af6f266a3eb1033372ac198f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/447] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 863274b19aa2112c00e07604d3f4c1a295316266 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/447] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 812eda3ee747368bf7b867432d86e5e8e41e864b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/447] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 278b82ec84b3249bc537a0e72668dd528ab9e963 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/447] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 21c0e76abba36fc0eec8a7c6ae000143e450321f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/447] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 4603b854bd8cd0c2d68440028e1301be134a8cae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/447] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From c1cd805e739391a880c54d802aa1c6c384e75581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/447] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 13f5891564bf8d803e6dcbc99ad3bd319018c974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/447] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5cd4873333cb4d8e06aec5897f655a2358ca6f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/447] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 12df56447c12bb4abc88360449efb001acc7c933 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/447] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 248733ce0a526e81029da37126267d1b9bb8c508 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/447] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From cb9ee6a24a2f3a89e67ee40b7999cd47f6ff5733 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/447] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f34a62831dbe4eef3cb29063e954d2e236b15323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/447] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From deccb2fc0ae2b20cb10027b86afd4763ae8cf684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/447] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From ca6408f30bf7ab3b9192e994c3b986b962fa43f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/447] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 8ca59b1527cf46c8f32847a9242d83ef8949a6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/447] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From e0bf609f044eeb9808ef9cd727ec2ccda815413b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/447] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From c2953e9f44a157ec8b213de855d0e9e6d0a69383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/447] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 17a9324664efc08925756c094b6bb08a85263fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/447] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 397502c9830b38b837d70a4ae91347eedfd66ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/447] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 2e0de4d418676f85a394ba675c4b45561a01ec78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/447] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 261e2196f65f096a1cbb96e6cd7559de1925ca61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/447] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From f65926dbf957d13523800de3327052c3e885206a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/447] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 93c09699222ef567bdeef5fe4f476fb2806623e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/447] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 7584143dea200f0d1661ecdc1d5bd336835c39b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/447] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From e051653a041a72670ab1caa0f39324b793a3f813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/447] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8c35eb16f2b0a00b63a9c781b70dcbbb29f0c057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/447] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 248f4b10dd7b4753901f9f40fddeb560d827eddf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/447] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 027abf871cfdf04ed1262307b4d1bad34041b954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/447] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 4ae261a8b95e974ed180645b94f8cd14efd3515b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/447] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 52af89b9aed817c0ac0fcc8cd6ff9186df6faec3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/447] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From add9757329f96b549a60357b7423e5e264c5507f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/447] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 17960ef50aece98fd3c0fc88a7782530ced3bbdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/447] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From cf2231670225eedeaef3a80ea215e82fbafa2889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/447] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 374fa97e837cf5a64419d9907dfb5cf36b468b1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/447] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 55d2e2ec0f539be126b5d92fca40d4a544ab7012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/447] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 1e50d6d335737c1ad91a06ce7829d7c1b66f7527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 358/447] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a1dbad40a0047d2f14010e3f0509986f585b3bf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 359/447] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e60fcf9a0297c6fdec9835e0506b5c8a6c5b3b82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 360/447] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 3be9afbc247333b894c0f1a36b957059273d30eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 361/447] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 70c7fe22f87782b09c3616711167284f2ffca145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 362/447] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 08ff1a2b641e7da6051fab894f2f8a6de265b8b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 363/447] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 51108fda84d0a86d279beba861ce39628af20480 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 364/447] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d80e026c791a9f01ee81dfb9baec50170c8b72ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 365/447] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 0b6970fa4c43662979a1816b45ab96beb7569a0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 366/447] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 08db3a1e15cdbb1ebea0a913a45f843c4187655b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 367/447] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From b7e9e687a492ab0b1773fc31d51d323d84981b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 368/447] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From cd21c74a9f2c3f62bb1240a8c2d702dc6a805890 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 369/447] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 0e38070f6e9c24eded466cba7573826e6b0dde11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 370/447] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 57f23ff4b31ecb2cd4811bbce9dedf2771feafab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 371/447] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From a8cf7783b60e6031d3a30946a49fa8eae767c283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 372/447] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 71ad634198da450d928864e016b2d87af4f58f10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 373/447] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 5050ce419529c730ca50c48c6703310c1719cda6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 374/447] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 25f4bacca05827f5b1f94ca3787c30c6cc2a9625 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 375/447] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 312973723d537ded50632efae2bebcd2947e3933 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 376/447] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 4df1977b13f07cb7a76377cd7865736da723ae30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 377/447] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 5c905268de154ca55a846641433fc7792bdadc04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 378/447] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From dab36404465a6f4fcd95f6276ef9808be367ab90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 379/447] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3092f03ec419df2d93379ad924cd6042fa0dae30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 380/447] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a4ee75d7aaa3e23126785f7e2016d6f95a5d4622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 381/447] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 5efd6773c62c374e24b7d2af1dd15028a84af57e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 382/447] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 7e7b822cd8312e17cabe82a0e7e47bff597f39fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 383/447] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 49655464201fe2afa5dffd8c1f3d6ca81a8ceb1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 384/447] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 6b95c576fa3e2006ee455ab402db19ad3a977e69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 385/447] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From b5a98a5cbc627b141b1ca780d7b5efe87752510e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 386/447] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From e30d6f3deea685e709a69f243e5f91b4ba252946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 387/447] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From ada418d9068da170fa08ee162a756e6310334dc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 388/447] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 3191482f99ec82addb9937aaac10a983e382542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 389/447] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 1d2ed4e72bfee3a63081b79663bb06fb2d8db3b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 390/447] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From cb0e568ef3caa6e1a751631a63a7a282d216c87c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 391/447] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 210c33aa396358e94287c04beb782e458f168e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 392/447] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 8dc520a8ba3a72e1af7b1e816824103fb47dea6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 393/447] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 69e778c7d7b07951fdf92843072d61551b59b480 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 394/447] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From a2f9f56669a41b64410057cf4e130aa40ae0f065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 395/447] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 0ee1ecdb2b7e67190f8650445263b881e86fdff4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 396/447] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 3d4d899f67fc034df5802ea04210b296247de63c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 397/447] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 6e517df1d8b19be3453bce3fb025b5b3f43ba5a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 398/447] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From abafd79a979329231d62465f946aead777c2542d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 399/447] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 804967db9c7a9b182a084c39acf5c01da6e16688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 400/447] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 9191a046ef459a7205fb699891a89a9730c3f3d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 401/447] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 79935f02fb8bdfec0dbab298835d7d5a117cde37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 402/447] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 3ecbecf0af50e312cf0ecfb0d36591551ba6a431 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 403/447] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 60c9f5643e171c085ab7cb28387e668be509d697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 404/447] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 68f3cea8535f76a23c081d00d0a8011e8d14b87e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 405/447] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dfaaed5678712fb392c0a9adccdc10be143b04d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 406/447] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 940a66f32fbf5c427877e2cbc3f4377140d878e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 407/447] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a98a7fd70d4aeed04e5d667e90dac9e2dd1b373d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 408/447] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 03ad2efce8539c18345f16ad53451e18f2d54087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 409/447] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From a7cd2368e623f502190deaa3b1c484a171f802df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 410/447] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 228d1691a28818644db4cf1d41dbf61ff27b3119 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 411/447] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 7d56eaee1af194697ba6e071b33b59ccb8e3b49b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 412/447] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From c2b47d5f730471040cf721c222f7aa5121aa20a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 413/447] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 809aecee6ecb8a34516791cc30f3b7ecbf39cc36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 414/447] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From ae4b828cd01bad5df964564dfc7d401738252067 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 415/447] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 6c5818fded8283a1cda7b1f99eb9394792ce08ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 416/447] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From aaca1f0327db25dfd27a1fd6a2b16d393ae35648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 417/447] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e537b369547371db9c03baaf1556a7a751a64261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 418/447] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From be0ba5b0556693b8a1096fc7ab4293bc467ea278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 419/447] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 5d22d7222958cc2729da1a057a4647654f85bab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 420/447] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From dccb46584024c448fbbbe30c837f6ac2d65df285 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 421/447] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 2553f5e631950aeed21039ab2ed0af5dd2ad72b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 422/447] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 5cb7e2c5d3e137bca49e1c8f2634233960e7a807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 423/447] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 75595fd5e85fcc5c12c90bcde8c9dd0196e63f80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 424/447] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 2319fd16379d4c27c992c948bb7476ba88e7a672 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 425/447] taizen: rebuild against OpenSSL

---
 srcpkgs/taizen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
 wrksrc="${pkgname}-${_githash}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="Browse mediawiki pages from the command line"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
 distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
 nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.35

From 5984fca28c9ef3c9a9a18d5c68f78fd3e02bfca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 426/447] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From ea9a0517a2d23599a22a2cf6eb11fecef6732678 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 427/447] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 0b126279abe2ea72a29da827156900bc7abc2a22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 428/447] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 9e3012b185f9346662f0df14cd2005f8851f6b8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 429/447] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8bf46eb50ff63e7aa53f4d5aaa935dcdccf59410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 430/447] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 52e0914d14c24225f191517238355558eebd2b4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 431/447] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 1ca9afcf8050962b42f66c1881f278f03e3f140c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 432/447] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 627311adaf3f3493db78fd4ffa6ec2ca5e8b5fc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 433/447] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 212f00f46a3ffacbb583320d2e0a5f7f402882d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 434/447] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 1f2745196e385777d15b03de56508007a01c77c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 435/447] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From e0967d1db3324d9a615eaa6a2dfbb294ea664692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 436/447] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From ac48ca74905debd41e24266c94741b6ac5b81b9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 437/447] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 30fccafd3618454be43bcde185daf4ef21cf7f6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 438/447] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7378c6b90fa80de01a8b9ffa7d0d67ac71b3297a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 439/447] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From c44d95f2020986d85417788b9d8fdceaed7f7680 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 440/447] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From adb9b2c15353ba983ac5d20c5b9f6339c44af33e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 441/447] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 377f9eb6412a7687edbdc98b26d99e0ad9b25cd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 442/447] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 3f91f1e2ec1eea59e994e49740972c7e7ea22788 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 443/447] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 95c71216e43cbab4b4036adb43fd28b41cd1dae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 444/447] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 4329a645f400fe4e6a298ba5ad6fe1538e01d253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 445/447] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 3edbd4b5db48df14176b432aef33fad0cb697969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 446/447] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  5 +-
 8 files changed, 4 insertions(+), 220 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index 3b84249d9c1..a7f9f94d3e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c4dc2785068..d6b039e4ccf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=29
+revision=30
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -52,6 +52,9 @@ replaces="
  gtkhtml-devel<=4.10.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From bfb876e5225e968de77512d24e7a99e7eec9a8a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 447/447] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d6b039e4ccf..c3a9617dd22 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 569123 bytes --]

From 01d04a3afcab93df5e17bdcf8c48174da4f13c7c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/447] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c..099944ba555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 80e2005a2bbe17e0c977988e1214d14cd26833b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/447] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 66f721b3ab7b69890c1238424dc7f8741985e982 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/447] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 978edcc21206964ab47456301de1caf931eb2727 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/447] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From b105ac165c75b8d32bebd559d73a9e1c68a15a78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/447] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0a14155b2d3778d979d70f72b25503ae254f2223 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/447] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 099944ba555..3b84249d9c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From dcef54b2fa8b877a7bc49209d5f3e01eea02997f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/447] libressl: remove package

---
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 6 files changed, 134 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 8960cb9bf7844460d153f2da43cab8da192c3175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/447] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 9becbcbc42248c51c26370fa8763fa0c43da3c53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/447] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 77eacafa981b4383c73c8d4d2d85bf8e79bf8dfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/447] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 0ad92f9f133bd1ea4a1e8609da15623e4342a1b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/447] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 6036aaf8d43650e001d655435d0f0ad3ffc54aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/447] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 76d5c8055907c80a125aa145740ff27687cf6bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/447] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From b616664eb9a2d412a59bfa2fcb18dc20247a11e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/447] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 65d639d7abd2cb1db26ea6d364f5075bcf816aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/447] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 706f715cc61095ef4eb21b1bf02f23b2a93aee19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/447] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From ce3debef47bd60a7f877195583cd926d14566fdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/447] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From be76d5a8b8096fb14db8001874392c62667b703c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/447] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f3204bdb065b40bf51e0af0119bf02a2e11f2adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/447] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From b5db572b4a1b5392c1171fb07821fbc909ec3666 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/447] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 5dc753d160482582754f1ee07eff3790fbcf4a5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/447] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ab4f688539b80ad4d2e42f14d69296bea3564d97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/447] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From db6094318623df794880447805a0989fc1528a1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/447] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 16e60c29bf71da792a44392b2448e40917eae9ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/447] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 6c699c66784280a9d65e4d22d1b2e47c2fa93408 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/447] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 288a8f1a6e606e029b4a71d655b9cecedc02cb40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/447] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 1a2ccd533364822cbdc907a18437be6d0d75c458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/447] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From d3827fc0b532e58142e6594dfe529c170befb2d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/447] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From e1933001c0c05c58c797ae30a53e80ba80d57717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/447] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"

From 257add45f81ca83d8e713b7ef45abfd93055f4d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/447] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 304cd7d11384c43bbd4aa1b523638809b13e7312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/447] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From b942df5b10fcee92b09801d22e855bfb3e40f22b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/447] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From e9f3570b60f35b2c668a01019fa5fe533c6b8e98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/447] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 530021489ef9e09cbe037a0db3fe6071278ee429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/447] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 2ac5bc7bc0ac7b99a6ca80a162d76afa0d855945 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/447] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From b8d7022bcb1912cf55210b5e12cd4ae0f691789c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/447] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From b81fe7436df25e76f739a520f1914c418ca6981d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/447] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From d2f70cd2eaa6a3905b3b3634d60ac910a2d115c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/447] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From afadcf5fe28cd4673b8f0766148b5bf5c4b72d16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/447] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From d7ae49fadc817c0f4e31f061b3639c5a54ae24d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/447] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 055d6e974a4d899bfc5b9dc229f7457a8db3ca88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/447] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From e010f96a073b7ed18d344a8758de9771a9e365fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/447] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 3b2a5ebb0b2a1ecaafefdd763377c7933be38d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/447] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From c3c36242fface64632f0b7997369f2112cbe52f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/447] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 152b692931951919d8ed875fb32ac25668493c4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/447] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 203fe933536806edc6046c5b26fb978976b407d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/447] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 108bf27bd45d662e9d5ca5140c5ad48a16e42aec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/447] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From a2df5664d687834b8eb2ed4f91bb4e27089779ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/447] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 68fddb2bbb6cd2966d53486cf5538b5d5e2e0346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/447] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 0ff9bf31397eec75f09786f4eafedd6801ccd546 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/447] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 75b60b8fe2501e6b1eebac00e5d3c17288ac92c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/447] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 098c2fcce518fedd9efd3ea89448e53242bd07d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/447] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From e39cf9d40394191f4ca67111a2af189c7aa7c82e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/447] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From e96f2096d0337e710b0f33c249a972f60e9c03f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/447] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 09c5fe57645a35de9279d066c6ede2da6bbf8bad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/447] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From ea0c364cb38e8870afc9c19f44ba98ab263c4dcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/447] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 04a365588db2b99e3dc98798d787b5f8845cd345 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/447] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 0528ae53cfe6503a89dfc7550cc0a2bac3243805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/447] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 7d5e875f6f6139658bcf6dd9d480452d50b2c460 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/447] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 8a47108ff195a159666db89f1facdccf98e470c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/447] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 6ee012a9329484919be619e691ce697dc369c6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/447] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 8897e884d0a4502c8e3f2096a83429f90548b914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/447] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From b03a723620095b38ad382ab6928d93339dd8d27e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/447] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 1d319f74a26098cec52ea75bcbc2e953daa0aefd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/447] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 46167b2d49ef8608c95b1d2b8ec885a6bdcb17ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/447] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 6833b0114ac2e54ed84943687fc17aa785c8ebef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/447] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From ae3d2da9b176b00ab463e66aa505655d4d126b1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/447] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 57d923dbcb022f68893b719dc061feb724c75216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/447] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 550f857e9d5e974b8d0c615ed7c98a734a9efab9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/447] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 408d198238e1d3bb3e5d99a83646f72024f41d3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/447] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 73179a1da91a266b7e20db70edae9153bd16e4f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/447] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From e271147725fd10741e9fa503b6e2dd06b812c440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/447] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 7aa967d4b5b0723266a7ed0121dad341879b6029 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/447] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 7ca7e9002f4aec76dc142b8962dd354fbeab11bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/447] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From cfda6e95cd9149506459fe9b42e2760abf2ea79d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/447] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 0a10be44f1f532e9cc09d590ec6409d3a30fb849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/447] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 0eaacb32c9bca3ce492ad84c6a8efd3063d24804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/447] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ba149d47aeb503d643c0e3ee30e59ff671fa6fea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/447] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From f2c1df0e21690bedb01011940e9f8422064669c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/447] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 1936947c3292a5d0551ff4b7f6068fd3924f061e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/447] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From adb8777d189f5dd8d8ca1ee85b8f9b9927d307d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/447] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From b9ede1cb8ed28adb160adece6e227ed3e6302cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/447] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From c521700e455c6e2f355ab2414f26349a1d1ca6d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/447] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From cadb680b526eb93ca3497625dafd3a2378995fb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/447] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From db2e332d71af19237523759d7d7115eb74a4ff07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/447] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From a393cc84b7d03ae3f9ad653a935881edba79293a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/447] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 4b5685cdb0ba6ed0cc453926e0a54b23da4aafe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/447] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From efe111c76f6c24ba41be5d595e1e7c6ef698772a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/447] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 3c9c668836794c162aeb3fb872c7d216e90e6264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/447] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 4191995f59665a26c51216d5af0701e2d27cb787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/447] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 948a9f1c110542befd07d9c84577e59016f59458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/447] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 8d93e70fdc077b2c13d1e8ffba59de035bbc1dd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/447] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From bf99ccefc954a7f6037c91ddc88bda36b4fd570b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/447] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From c1d5a7a4047a8fdd86207f2e9bedd23af7b490cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/447] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 538a77dee2a3eaa4414294cf1f53c71d85192518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/447] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From cba8dd35a5df464be549d893c234dfb34892963e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/447] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 794d17c5b19b7cff155505e6ad80081df6589c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/447] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From e749126ed3c9c1895fa03bae869b077bcdcc38a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/447] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 515250844c2f75067ca7187ad4dba497c26f42eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/447] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c95bd33a35dbf7c9a673454f436f73827d6e4915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/447] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 8f68a2ca3c880e347e8e4c113380d38b56bc3e60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/447] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From b1c9c5c8bae46abe7aa1a90bb7f1251093932ef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/447] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 63bf28871ca9398a5786459fbab1a3cfe566449b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/447] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From e847ab5ed2fbc423f5899632a90f97491183b90b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/447] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 63288955830bb40f090ed09b48703dfb3dcf7183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/447] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 96fa4c761c0fac2014cadda4e812b7edf6f9429a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/447] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 473521dd364d6ee59d2445d225161bd628df275b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/447] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 550900d0ceb5fcee4ecbd026fd864155a58c4088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/447] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 41c472f6e4a6a8767e28f7ce2bae715f946c32eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/447] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ce965d076ad8f3f56abecfbdfd5b44ba544c8c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/447] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 9f2d159c8a5aa3c832748341e4203c6044e2038e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/447] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 9a63382ba2d1a453154b57e6524774c63fe12bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/447] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 848938be468f68fd0c1e54b00319749c59d5c3cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/447] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From f51ed722905f4d5f9abc8a96c61ea29dc3751625 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/447] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From a61c1317ff35ebb303ceb15b48eeff2302d4f440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/447] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 69bb4bf1cd91f6c70d3fc91d04b329eabdef08fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/447] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 369dff03a641ce04750d6c363a26b58c98b42871 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/447] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From ee148a9074cd40e48bafbc7711b73797bc54379b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/447] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 519c56653b731ad12503ea0ffea737c90e4d7166 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/447] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From b1da6dbbd522106dc545f7a710b4b214e8175bf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/447] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 2e45394d06da25b932cdca0e434fcd964e23e4e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/447] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e818e6d5ab65b2d8e2dfed886c33918666cb1996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/447] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From f306b15292c821ed6b5466fe08f7de69bbd092e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/447] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 8732531bf6c5efcadcd99c4dc5c20c2dc9dc9b32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/447] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 4a68b1e2cdb49f8944209a63f9d1fed9884cc096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/447] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 8d4287d1af7b06a30140fb0bea5f9fd8181ce8cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/447] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 167678c9da31f941732053f7ba580c42ff98e1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/447] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9d02967ea9215b81fb2fae09c839435bbad017a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/447] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From dcd7ff6c259db8b8645a5c29009f03287b401035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/447] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a30db27f255357bbe0eb42cc3d1b54600bbd905c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/447] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 74a485a92c5a514f812cbcfaec4cae30b020661a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/447] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5add758b55c7b742178e959827cfe9762150342a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/447] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 8d7b754e6633b9c2949a765f974d2cc245521f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/447] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From e400aea49afd1ddbfbbda0da0875315728e71155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/447] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3180f0b76b45f98a5a700e957dd173bfb9ce87da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/447] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 90ee9eb43c44d19b458d5eedfb2f3f5f3652ee93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/447] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From c0ba38f2f01f90a843b9f4a6382388afd72c39dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/447] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 76ee8e0913f209023697b8bb3630c90160321f60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/447] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4392a7a5aca14ab61375f90b7070ba7de9e1b557 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/447] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 6634f54102d0307676c85cdbd27042004743874b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/447] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From b03162f94d2e3e9f0791d0a92f082b3447dfb2dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/447] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 9e48d152fd94fed49cb70d242fbf064158879bcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/447] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 574bf58ba6e12804fd800546f071a7e2bdfc1840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/447] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From eb4c9bbbfbf95dc1ebbbac5ff79fd95c641143b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/447] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 84e10d1745d6496bfff03f2e20a1f148712aa2fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/447] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0982d5819b9ce8a0d25eaee19860147b0c86db8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/447] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f6ae46fa366598f1c2b237f0a6133c79e838f966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/447] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 0ed0d5335628a6146b7ab58e1e06ad9bdf5dea4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/447] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 5367cb548ee45daf0e6bc1fb16d97da085d21d7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/447] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From a5eeaf6223c717337d6c1f9e82f23052a995beed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/447] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From e12ac59f301a054c8b0409722c41e32a56de3d52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/447] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 58fd885392cba5d5c09aee5c9893140b1a7125be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/447] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 9bf81fd9e2efb1989c33a911e9ad956de35618d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/447] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 8ace9d46f39cb76ea729b4f4ff13b22d75043cb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/447] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 5db9650ec0175634aed96aa021ed4b28b430014e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/447] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 949e28aa2d8529d3b222e91e0b74637fb29fa520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/447] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 74a98e62e11525d15a3a1270afa7ecca81ee07ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/447] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 141cd1f3e7ebfa9ec97c82abdda14218ef5bd717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/447] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From fc572ad398715a30969d731088dbcec5cc628d94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/447] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From bb91b0817bdc4591ff39f9dbf13727a77efbcdcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/447] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2878d76e35116e647db51133996f491a52d14a4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/447] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..92ff4241b68 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f836c45fb755830526cd00633fee28d6aa83abb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/447] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fda74484e49..26b25d6fb93 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 1278892b254882edbe7da968f48928680ea70d55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/447] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b13e0bfedf27e232a8cbd771661143423135e73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/447] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 8de404f71d2ce54ad664bea6c86b964c80f62492 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/447] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5addd07b5a58b9a289736274919ac88266452fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/447] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7da465f5faea5d34437274e37dd0243e9acfc083 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/447] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0944b3167337623b835c74869225e5a70d0cf450 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/447] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8e4b794cbbcb75f07ab4550f57a88d9f178f741b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/447] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 18ac0b3e9115b03a2d0b770493242b0499017a36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/447] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From efb801c6da58e4143ccb7263f24d09dbe52b936f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/447] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From f7dec2dd8dbebffa2185e226f563cfeb7f811e68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/447] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From bf0c2c97eb64c8b5994be9204e6e1543cd5d655e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/447] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From d92bf774d91d4365e2c1a068970d4abe4e9cfcdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/447] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From b381b3e3a924267a6f945a0db7c35e28ea7df479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/447] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From cf6e7b8988e6b2bea3f87cdff847ebb739d9a70d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/447] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From b16bfffe7b358a565b1736627c4cc2ee82ddcafe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/447] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 3591b44ece19ece009f1f46a5378e97499425f3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/447] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 328d798476e9f1a60df1b455bdaa33da77e8bf13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/447] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 171faff0df4b27bdbdb130d75a7965253222cf5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/447] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 8938ca910dca76f80d8997d65ada70f18aa5626f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/447] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From f0f34522d097135218c987e597dd36d5604b2cb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/447] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d9a2a0ab29ff521f7e43b47f7aac20c514d23fb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/447] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 2560965900b7133be1ea6a48847d861ef3559317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/447] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From de46023671c9ad8ab1c6ad7d3ad8e9ccbebf5d7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/447] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 35189def33f51230d8e1ae919e884d61343fcc93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/447] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 66ff8852faa80e8ea83fac2b8253df72aad59520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/447] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7f82d74071d5e375519169fe940f47fc02275028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/447] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From a69d7e2a990714084d031460cf74adfae8b9dceb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/447] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From f440bf0efa915f243e6b73841e58201d91e0b865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/447] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From f254a8e0621263a5c261ada58d7792d423dbe33d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/447] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From da62d47a257beba1f4cd709674a56e33deca6b09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/447] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From f391a47b918422594f74a19644ce22503a8f09cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/447] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 8345a3cdb5c5d38d919c789c06f284b255819be9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/447] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 831525c5cc3ec665038961ff01577de9ddc1f2f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/447] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 0e08e2c47d4639ead8de4f2ae59da2eac098d6c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/447] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From bb4c97c684e2e14ec041b83b6b7ecc3c32430607 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/447] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From f511739b661fe1ff6f35d38f00897bfc44cbe564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/447] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6123b5b84ddc208b1afb42c1276333b02d177747 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/447] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From c2f8945fc1a7d7292a3ec602f590753afcf7e50a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/447] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 2b24a1d8142f7bd17d2900b80449087a0a69a374 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/447] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 300b0f9522c06e6b9a4fcab1b63c88bd3e84f1b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/447] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 31a7f57d213bc006df75119a261f6db17e85ccea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/447] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From b6bf3bc5c495d3ba0d1451677f3e8ac2cb62dca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/447] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 99e2a01754f99e048e41c8f1004f2f5a68e63756 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/447] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From cbde20d274f97a7230662e9a6dd2ca2a6574fa8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/447] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9069ffe681e9e5598636c6540d1bf453470b28d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/447] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 36610af51ea41288bbfa60e640f2bc2304164647 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/447] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From d0a7f78abc7a5f33b6d5c247eb2a5a2ad85096f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/447] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From e990913f52ed18e3612a56a1ffa8ffae1d8fe936 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/447] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 03c423e83bd067d4f21a0666e33b52503201ed80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/447] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 04eaeaa1f828c59ce67599b60de15b99dc626fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/447] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From a885c62a576eb521b9ec34dec8c84bb23bf9ad95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/447] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e..b7905e70e4b 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 50feeeb452f85e891ff61e2cb80a454a341218ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/447] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 52194c03d8b3eab2d8ba32a3083edb46582c4fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/447] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c4a2ed9e5b989438e3e6c74cbeb8446e7ef8049f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/447] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 3fa06f960f3ba69534e073ca0eef89707361ac04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/447] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From abf72d4088f4658a9dec1d396085157af2075733 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/447] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From d91df0b88806006f99c724d751d4adbe85407075 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/447] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From ce226a56cccbe0412f4cbb6ab5dbcfffd388cbac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/447] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From f1b5e82ff2e7aa085605514e9900e2b20adbc347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/447] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From c0c7da2d75a0704c61d0347a5584f70b1353dfd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/447] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From fef7116cc4ea034c98472d99668369787dec2683 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/447] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From d39d60ad3d379a9c3e5b49669f059dbb9899996b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/447] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 025961e197659bd058887a4d52e020c9d4bcee23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/447] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 43db920dd5671a28461817d39e6a399676287990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/447] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fd702b9118c4eb4c8ac1e165ee13c005e2a94739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/447] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From c0b5e408abd09ce5b70d00ebe5357cf31422767b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/447] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 1845cd7a21280639cf4b0fc4d7bfb9175b206ad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/447] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 0c27e0ce98639f07310ff81ff10d12ce4d952670 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/447] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 4f3e6ab0c7bf5bd47cbe49618f08e6227469fc1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/447] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 25e2a600ca7e4d8b05d5e804c42a456b85bad6c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/447] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3e5a8f96cba7b4a4990dc1eb931ef03c397e2b7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/447] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 606a7d886d0a89561d95e2d60ffabc6b2d1b599b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/447] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 4035ff85bc4dec7fca268fd60d269989f57ec043 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/447] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From a78dfe2afb5bdcf5102988ef436dc4f6d438c745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/447] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 9ee4d6c4522456e17fa614e458f1993c2c56ee58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/447] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 725e9b1e9ed617a7d92dcd632189ae79c005c892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/447] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From d1344d31ca507e3514e666118d288dbe8ec2df7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/447] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From aa53a6b9fd58e1172cc24e44128b8ece3ac4716a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/447] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 03240715ac50eca2cd9fd23ff550425d7b43e4fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/447] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 87bb6aab8f74033922a18cd4871a902cdd5f6cca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/447] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 27fb91b867bd61c4ccee3f3451086b92bf750b54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/447] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From eb5ff1ad7cbfe1dad3e75660a87aeb54fa14f561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/447] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 28a07d7ff973356a3076d3a2ef6585966da95c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/447] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From b661175925786503530c94dbc85161d30998d8cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/447] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From cf6c690346c498f54b8d4da0a55f1c7ab96ced12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/447] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From bf9af2835e4efbe155af52ca6d1fb54570a1e197 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/447] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 7a4181380dd4d63865d5515236a46699141c8c6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/447] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8b56b3f2ec5219235b3ded9802654ef16373a28e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/447] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 0ab67a4399fd65bf7b47fb95e79004ed6e0747d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/447] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From a853415564ed3856201b4f5b84d27b63c9ac288d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/447] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From b99937bac608d2b0720b30176e772aaa112518b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/447] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 7b5135cdd172eef747d0623f76db25d602988d09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/447] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From a590a54e63f8b94f27a56dac938b372b71b60a51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/447] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1ec4a7a9e64b37778bbe02d5fbfb6bd644d74cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/447] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 5b73d97c2aab4d024b142999e9c22fec8340ed28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/447] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 1f018f1543799aa4db5091905da08a71ed278ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/447] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From ee3bc9854d40258fd98f4dc634fe19fcb4601a0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/447] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 9724a8fc204c970bf75d57f770f0788c157b593e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/447] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 8932d9c1cbb10d5930735545deed3df8ed869775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/447] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 5dc2b95c5f6425389d1f8d324241f7a7b1ca263c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/447] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From ddbd1d30ea2efd154bba4ee1d3dd0baeb5bc888c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/447] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 0ab753c4568b963641000a2c82bc4838bd304893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/447] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From f8442deb22e3520c9accb9b7e5259e3f39cfbe7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/447] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 9e90e58877b6317ff8b08336ba673e22624c226a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/447] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 5914a68c63dfd2cf6d2a8d025d5eecb677963da1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/447] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From fe717507ea426ba4cfdade88ac26163530f2cfc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/447] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 48394bfa1d06ae9f9b32b5e0ce21b5428e97e55e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/447] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 99ad0a0845e1f4dfb9a8e64ef269671c086c58ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/447] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 64d6526e613eeba53660425d007e317deeef9d8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/447] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From ab3331b0c350d8a3f181a9f07198854c75da87e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/447] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 1cd15547cb3a5eab731fa4362b1e3940a3291741 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/447] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From d181e5a00b91af9da90c338d32537fd852a6d7c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/447] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From ad8ba0f7c9137475712ee7bbe0431a5a74d5f7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/447] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 9f623966ba509748c4b8d26125ab8d5b0fee86f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/447] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 16ca456d5f1f11486d9c5ef7c329919fa2841587 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/447] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From e21485786cae97658fefddf1a3be3219c329cea2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/447] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From fa8981a353ba6762188eef975662ac255b669a52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/447] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 19dc0776d8187a7e83c7ae929da6355c67c1c2d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/447] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 91183599192eef498961a262ad5d7aceb9b3b616 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/447] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From e8df50fa4bb1124e0484a6ead3243a00ff7dff7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/447] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2393c53ac91a6e9fb505a4973aca1d454f14247a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/447] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From d23623b7c0f8230677fd26696e8a464933c07f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/447] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From a151c6ac7f72b3463a5dd64a2add4a601b503b4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/447] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 36fc4f27a373a143f15ca125e29db13a1a003ec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/447] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 88dabe70a6c8a734dd9936b832047eb08f239ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/447] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 6903ed6a764796a6611543baad6d2b79881db67c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/447] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 8d31b74cb39821b504e38aeb40a1dcd32f5c4330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/447] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 965abef8067034f649ca73ede04a080eaa8c4488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/447] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 6441dd855b27e54ad0eb18497bdbb58c882057c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/447] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 29e3158e39fcca008129d005457f6f7b08572486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/447] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From a466116b9e6886ef03fa2ffa389ce6e7118a57d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/447] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 53789feda208052a2cb4846c80edf2b42e748555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/447] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From e3b029529c4bfba5b01707326b5ddae16e7cb2c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/447] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 4584f6515fa38d02920658b21a9ef0aa546a88a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/447] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 70e115693fcbf3b5d1ecf86608df772e03693699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/447] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 4d1750d998e6f105bc013ef0a9f5b834b9883439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/447] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 2c8376943ba1b5ea0a239c8a8f867730e58ef309 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/447] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From c65151ba680d197b0c654dee6ff5861e5ada24a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/447] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7e82b2e0ddb9cf8d97fdfede735e2208dc8d4488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/447] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a52dfd5b25d740b2c41d0b3c58555a4986c06ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/447] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From ba99e3708266ade6a857ef2066e9559692318aeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/447] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.5
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From f7dad45910f8264ac8c54f4a0e42b6432eaa161f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/447] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 1d25bb46c47d1c3ef204bb5049b1765439bb9282 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/447] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 5ac4a6d4bde2a6c7048e0da11bcf12aeebab6983 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/447] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 98e7f774941b1e0c98e90148c01e959fa72cd8f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/447] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 2eae6efdc65084c6f987c038c7cf0f793fadaf9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/447] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From da08f30f56f0a9602c839f6e2d42908c62839bfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/447] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 02a57fe983992b6c2f994be282634241421c2aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/447] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From e5bbdb411e4bdcf9987a1a090118acee6c68cd86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/447] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6c21fbb3556cd2787bf1c300b401d72e7c4029a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/447] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From df6ad6d77722bf3c44c674002f127608ecfc1bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/447] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From e33b8ee152c15c5788eab38c76526f24fd51539c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/447] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 753cca939addd3bc51bd5f4b078fe4b89dbb7b4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/447] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8dfdacc5ac6ef1de75bd1ed3ed9a7eb995552e90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/447] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f64b08c422deeda229cfc4b29363fd05096a97c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/447] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 152a9cbf5ee7d91797ccc5baa2b01f7a8f055eff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/447] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9361e5b533985a192e34de456f03e737981d0288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/447] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 5dea9e219117069e85d7f13d97157dcd0fa1bae2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/447] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 55b02a72204d9f181c6aa159560aa90f67263ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/447] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 555a95bbc1f767ea242b7380f3713a3be5abc928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/447] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 7efe484bf09a6c075b05afcbe9a7401ae04a3f75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/447] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 05f69ce4ae50d2a961d3bebe56a1e65d233a1e04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/447] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 5a7bd69ff211474e55eb1a9926191a77b844cca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/447] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 4805f6a24a9a6e2bb37cc59374113aad6859bca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/447] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 976cffbfa309da96a20c13c2ed661e8ae2ea5f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/447] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 2d1ba67329415912411f160cd45f3e62ba87d81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/447] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 4e1fbe621b95350868c2cf121a5de176e01cf32a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/447] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From bf3ef15d12ba58b7e47a450cab6e8982745fd106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/447] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 10aa3d1f4f0d5d54a276da9c8d9c6d0c8d3e20ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/447] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 2e956e3ebb60cf6b098d4f36b0424a5597cdd132 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/447] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 49aaa17258ff98adb5350347ddf5a5da4181717b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/447] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From c2d825426cd99adffa4ed0adffcfac46e5a538cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/447] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 22033b2ffd00670cfa86a175068b5e4d22899b26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/447] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 8e1121d151bbd1bf278632ed961473f058bcc21c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/447] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 8bd62168bf2b86fdaa4f7d658e7745f7530eca03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/447] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 81956707c51d610895208cb306096a458c80e515 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/447] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 6ee9248d32480a4d7f43f3ddcbf21a6963e7bb2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/447] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 6ab6bcb61ee02ba057d0642d4860324b3bee60ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/447] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From f883fea6d78e5f7dcee3f4a2dc921b86c0fbc866 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/447] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 3bfef34bdb75ff02786d41fbd40932ac6947e66a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/447] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 2e278f8ac66c5da3286db8b6d6469b111e268def Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/447] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 493c4d0d9e52e94e7f2c71f1e6611a4d9b45e175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/447] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 9e6396898e6903caa30555861470a3bd8788c19c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/447] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b5795e66d3c569851db9e77df46b0c5f101ed191 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/447] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 98f953c2d1265c343ae3ced025d0e9758d264a6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/447] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 2353f28fee1a1634e1f55c8d2051deb800b2282d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/447] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From c6c6cc36f3e4befe3af81cc033058b36c81e0c1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/447] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 7cd4e30f434469a4cdb84c164be365cef1a9b7f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/447] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From ae6deb16a09bcea6fba144a57085d6cac31137df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/447] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 209fa8310c1a0eead70df0b47a8b6935e0493b67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/447] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 8aec12eb3381d66d4dc850b9adfb8c1ddc32f7f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/447] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 75389185b0b398b5c8116f39e8becaeb8c75375b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/447] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 03a30d3ca02c761106f0675a555e0dcedda7626c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/447] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From fff68142bfb057d3bbd2d26c7f221e66ec1f4d84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/447] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 62b663990f32d29447d7d774e79c9a341c48f785 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 357/447] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 70139ff32392a1c09427b5f3161ec8135a6935bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 358/447] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 636d242d8765163df0ee0a71c37904aea88cabdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 359/447] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From a44392c1e7a953cd2aa0c3f919feb064e71b379f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 360/447] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From f36a695fcd758591904174635638a70d524450cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 361/447] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 6504b2e9b82ab8e00a6384e258ed8039ffe14130 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 362/447] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 150f5a270e5dd43bce89c0d88b8ee9e0efd799f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 363/447] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4a9c0d2b618e18be58beae1652f5ef04460a3028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 364/447] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From c3df690853823b37d6fa294324eb6e70f0ad129c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 365/447] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 01daebcd016d698545d0092dc2ae9a99aef42cc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 366/447] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 7658134dbdfc8871a0b58cb8232e081467040e51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 367/447] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From f34d2094c785e6216c5bd96efbe0136a90510ab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 368/447] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 22a84c343e8d33701e372383c84c07b8c3ba961c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 369/447] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 26614847f5cc7ce4ebdd647fa993bfb433a1439b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 370/447] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From dab1b721a7ff8cf11cc6e4c57a51584278350aff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 371/447] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From b94e04bf46921c7dab4650b299b506f48e8149e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 372/447] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From ad12bd9764198d75e32a45457882bbfdfa4d3cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 373/447] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bb1fb73cfd43d7841e1faa88c882e0a55c5c5af8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 374/447] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From b63f9533df63e5eb6dfd886af9d7d93fdd9e00b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 375/447] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 06a463ad40c8ff5f087ee401dd7896601740cb59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 376/447] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 020a552f32cf4bdfeeeaed47821bd8e110bf0178 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 377/447] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 1f6debbc7eab3634f8c4dc6fb473f267c4741f2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 378/447] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 87c54455154d1030f15b1b602e5d4fdc67ec7837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 379/447] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4fa02efacb51bd14afb93d89c92b8d747ea585d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 380/447] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From aedc1a9f9bd18a64880acfdb69a5541f3ee6ccad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 381/447] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 470d7681f948ed4c3a90054303da4401868df25a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 382/447] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From dd4363248661e4e1bba399a9467d4ad801c882d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 383/447] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From ea9ea316d31b2be5fa378f1c2c2b6453fbca1b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 384/447] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 072d593de077c0ac9830652b10ef19bf804408f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 385/447] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 953bae7bc1d0190a812b1a59bede91eaba2b934c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 386/447] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 43203f1083f061f6247180fb02ff71a0ab3a860d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 387/447] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e83a2a35cb750c384cd5a3894849924ec427c63e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 388/447] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From ac6d12e3c26136593e314a656cc5932da9d4b70e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 389/447] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From e287d5f601b95730463dfc8ca21d2ee1468316f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 390/447] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 65834fa1fcdfc25e757fb1fde21d224a3680bb5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 391/447] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From c47bf81000b0c61f062ad68115cea6704819587f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 392/447] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From a7f2aafc29583b7700b4de65875ac174819d3d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 393/447] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 5b7a6348e9b80c1640461c3ee9e3ede7b21b67fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 394/447] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 96a1115b7bf5e93cdf380222bde6b96ae587c598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 395/447] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 3039be5b740deafd0fe371b99c10586f69fa9781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 396/447] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 71dc9e87115529ac2578c9a7c1db41b5d0c87d66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 397/447] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 18e315898a6a9121b3cf9a96742ea9705bae3084 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 398/447] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From f25d53787c840d09197f8c1e319e9c0ef37c3b75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 399/447] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 80565fa251e6d57e831e1981f2282b19d1bd992b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 400/447] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From c812419104e01940ae474d1ce01e003312812c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 401/447] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From cd8982228318dc7936ffff265e09aaf59d977198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 402/447] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 512c0f1094f887c9809236a7e827dec56731dccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 403/447] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From c3aed1224ee73d0d47c3491ab2e5b417ce05a8f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 404/447] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 20c5298e19feacf03251e0cb1dcfb3683c48d207 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 405/447] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From f5e90b1da0fca39308786f8edf465207678ab160 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 406/447] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 38757698769cfcf60e4e82d2bb5060315fb0f5ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 407/447] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 1a221460553a7a20a01e3ba334dd2bc8b96ea2e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 408/447] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 0227934a353ebf713643d59b7d6e238d49d2b301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 409/447] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cd0f9ccd05e98193a59515e8e2dc84e0433e85c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 410/447] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e9ba671098b4114d3dd8a66931b25f3460b4081a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 411/447] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 51e1d6d9e627fd4ca23352c6f324a0091d8eeefc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 412/447] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 178644314c471d4095f3990be07b576fea4f8bd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 413/447] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 6dbe0bacb3ce0dd5165766d811b4e538a318546f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 414/447] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 32699a5d9c4de3ee6d48452c16cfb9c9cfbb1ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 415/447] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 33a601ed40b44202b3ff37025aa247ca8d3df5f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 416/447] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 80ec61b6bc870eb9835cc20104e56daaa327188b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 417/447] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 214abad54892058c2645b597cd39853948839139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 418/447] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 0986379ceb24b4b1a8ba898f6594ebb17be3d37f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 419/447] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 69717856cbbefb5ded57bab1b5301437213ae1c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 420/447] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 5e52bf97d8d1b0a2cef51a04f4097b8bdb23b782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 421/447] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 21edfe4cb8d2ada5f1049902a8564c558f4aba25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 422/447] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 9360c93098b7f444801b8e4b9f56624e8b013591 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 423/447] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 15e11c3a4bdf24f79c839c6c07040d0b41755f1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 424/447] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From c13020f368a37cf5b994eb57a804234195ccd0da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 425/447] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 76d275d3bb856c05b5624977587df3b6f2d08575 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 426/447] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 25b8fdbcec796bfcf6844e548dffb84b588325b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 427/447] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 65020adc0ffb0ca90c18249c0fb79e9f08aea925 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 428/447] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 8c0d3e63b6dd2a62a78acd0a5fc669a4548f1a63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 429/447] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From ada4bb440ace74ead2c9a19b79951b8588dfb0ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 430/447] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From acd93802923c7495948a2ee411beb35d26147c5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 431/447] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 9decd6cc0d821b26a8de84c9f5a6df290d9abb4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 432/447] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From d1d7118762a2d51423d1090a287052b9817e7ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 433/447] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From b782f05114a16da04246b215f2cd0f1a5a38efa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 434/447] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 2ed287994d885289a73f5cdc69bbf20198ac5a4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 435/447] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 69750ddafd02608c6b0c40d24adfb76b4860cd64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 436/447] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d65a69aa55c85f773140ea572a91505c80c2a145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 437/447] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 034b3dce2ab96380a0879da509dcc2b9943886fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 438/447] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 75db5b37a3033d584eb87323016de3b6a8ec6803 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 439/447] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From ff76225227caf9b5e1f7e434164490c4c5aec671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 440/447] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e6e1fc2194eb3a70c6c1cf6a896162e8af0b200d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 441/447] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 3273fe76268e817ff8ba24ccf9c546fdc1343eea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 442/447] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 23d647a7428b79c78d2a5863550f903c3f12991c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 443/447] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From f80e81d1a35a152586a04440dc76bbfdcbf0b019 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 444/447] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  3 +
 8 files changed, 3 insertions(+), 219 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index 3b84249d9c1..a7f9f94d3e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7091b354b4c..afcb7bec191 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -52,6 +52,9 @@ replaces="
  gtkhtml-devel<=4.10.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From dd75565edb5b9b1159bcaab35399e7b98c2a7857 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 445/447] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index afcb7bec191..ddb3688c18d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From d1d2d31e3c18fac4bee0cdd8e2ec767d7d56242c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 446/447] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ddb3688c18d..c78cc2ddd55 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -237,6 +237,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

From d1305bf56e666fcbd6ef7da49e1209b60f578e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 447/447] taizen: remove package

---
 srcpkgs/removed-packages/template         |  1 +
 srcpkgs/taizen/patches/libressl-2.9.patch | 10 ---------
 srcpkgs/taizen/template                   | 25 -----------------------
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/taizen/patches/libressl-2.9.patch
 delete mode 100644 srcpkgs/taizen/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c78cc2ddd55..4acc143893f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -233,6 +233,7 @@ replaces="
  sqlite-replication<=3.32.3_2
  tagainijisho<=1.0.3_1
  tlsdate<=0.0.13_16
+ taizen<=0.0.0.20180808_4
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
diff --git a/srcpkgs/taizen/patches/libressl-2.9.patch b/srcpkgs/taizen/patches/libressl-2.9.patch
deleted file mode 100644
index e38d7460a78..00000000000
--- a/srcpkgs/taizen/patches/libressl-2.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cargo.toml.orig  2018-10-30 00:39:37.753448674 +0100
-+++ Cargo.toml       2018-10-30 00:40:01.649440996 +0100
-@@ -13,3 +13,7 @@
- urlencoding = "1.0.0"
- clap = "2.32.0"
- lazy_static = "1.0.2"
-+
-+
-+[patch.crates-io]
-+openssl-sys = {git = 'https://github.com/jnbr/rust-openssl', rev = "5675404012996556db6bef9f8589536241561699"}
diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
deleted file mode 100644
index fe2e78bc723..00000000000
--- a/srcpkgs/taizen/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'taizen'
-pkgname=taizen
-version=0.0.0.20180808
-revision=4
-_githash=39f77b5c1128d710b12244e433677daaf87c085e
-wrksrc="${pkgname}-${_githash}"
-build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
-short_desc="Browse mediawiki pages from the command line"
-maintainer="travankor <travankor@tuta.io>"
-license="MIT"
-homepage="https://github.com/NerdyPepper/taizen"
-distfiles="${homepage}/archive/${_githash}.tar.gz"
-checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
-nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.35
-}
-
-post_install() {
-	vlicense LICENSE
-}

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 566575 bytes --]

From ecab40f9c374ea0d865af1c517065388230dc85a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/446] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index be04108f650..f10cef098d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From d167bb866bfb0e9275c08580ef37db644a2c1cb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/446] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 452316a1c926223f71c5157ce02d11b710a2e615 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/446] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 0e93076536b77406a92a24508731e1fe23556439 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/446] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From c1385597cdc48ab54bfeb3f359d9d0e1ec17f19f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/446] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0293babe6c216c7244d4de84edb5f994765007e0 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/446] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index f10cef098d4..8baeacb8e05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 5553dbb631c5bb20160b44678e7ac1445a3d6213 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/446] libressl: remove package

---
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 6 files changed, 134 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From b9c5bb1f86def0c0711eb50573aec6eaaee158e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/446] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 7c86ea60d8d343ccacd89d90f0c0aa3d0ee6cdf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/446] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 2f02be3e4d74209bdd579846c4c55d4de0fdf61e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/446] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 8c2ef9ae733e28342fb0f1298a49f9ddfb1fed4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/446] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From e06e112aacab6ce63ceb7ecf75d3d496e85b8692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/446] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 5dcfe9a3e25d9969b3cd8216369d82a07f5d938f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/446] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From d85a88189dcabcc6a7ecc7e1e7a23afe055da744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/446] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5f12a8f552634fef4d274f1bc5e4e99d4cb2d9bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/446] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 50e98156563bb31c2df342d161841e2057fc42b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/446] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 071cebbca8c11f2e94b41caaf78bc63d49aa2e71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/446] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 8aaea5e77768a55ad294b0daa0c483fddcb66194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/446] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8b64cf0e69c22c5804cf1fb94bba65da7ae7b71a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/446] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 650723e657c466a1736adc320dc913c20bc5f557 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/446] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 425b9210f4f57bc22d08e3888ba74ccb73363259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/446] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 918547e9d4c51a8fcc3c6bb7d01a04384d11eae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/446] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 9541018b6789ba5bfccc6f0f2d33d3f27f867584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/446] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 3c57c40f8ec4d714c9e9c92258675c7089e62592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/446] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 74a37dff183252c2b8b68d4d0f28131e4fe0b7ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/446] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 34ba04e43118234ce785df2979b91dc7682410ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/446] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From e18ceb5b79c50eb23aed6ae4bcc72400a72604f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/446] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 1794a2c6ad12c28fa76da936738e55cb2131afa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/446] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 93fa380c14d02c93811dec5bd6e131913687c97f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/446] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..5497876ec39 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 57f09f6e8c74b97d5aaa21c4361b322dc8489b40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/446] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 842fff54f7a5f00479725c24f114aad31fe5be94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/446] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From eca50ba941d51c4339aee7b91a584e2257cf4c72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/446] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 14e0b2e91fad57358581971ba6f27be5e1fa630b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/446] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 3c897f2541198dbebbc9b998870b8d8572ebb9a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/446] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 38836c3b3e39cfadd3666b56b7a8b9bed94771f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/446] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 07d78a3ac4675109b5fe3f8efd5f4d1cf53a70a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/446] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 7f954eb1d24fa0a8221e892191b3af73b893ccb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/446] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 1440d93dfd9a231bf35be654d536f6abde3a0de6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/446] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ff4321b940b2eedaf524de2e8147218f38ddec73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/446] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 311ae851559ce429331b316b1dac36ba4e88c4b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/446] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 37577199bc351c2ea86b5820f58078856e6e65f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/446] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 9430c24c8ac5cf06b7d3cb65e54f8a9eb9c6278d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/446] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 782ca72eff9589f377cfb0ee1961a16bfe0e806f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/446] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 166948a2dbf7ff7130f562012839e4fd960eddf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/446] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 4dff0b77bfad74aa5d189351baf93fea5ef038e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/446] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 9f9592471b6ebaae184c3e38bb2036c4784a21ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/446] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From c0f3daaae9eec3fdbf5db98828aeb21ff60128d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/446] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 757e28afbd10896ed9a9c89061b8345e920f83b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/446] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 310a65770ddcf58c063a3cb6eaf2ed4e1ae6bbea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/446] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 792636dbad0e75d3ee6b3a2bc62e23d9374a52f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/446] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From e362d6873bbb14f8b2fdf5a14f87b39659ceecbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/446] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From c4d0a4bd0754a0fe02ca00e29167df16e84e10bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/446] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From c5594577041d50811b8c9dd11ba23e995f3aabe9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/446] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 0806f4562f22dd4af492daf2005e9448de2b702e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/446] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 20ed8eecfac0181bfef118af3b3a60c70c1fe134 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/446] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 77e3deb0163bd45ce948de4219b41511b006cba1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/446] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 6dc21bb8e03ea8b72cad86d5b869b90bf2ce7931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/446] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 55569f98b2cb915687db668cb6ca0738010da9fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/446] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 85619f362fb1b719e7affbb52c95177885afe106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/446] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From b25887ab3cd9c306f4c094c3ed5d6e79558b73f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/446] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 27cf543743b191f97fb1f0aad11f465d7cfca938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/446] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 2d06f757fffb65625d71990883172ce88b49b726 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/446] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From a8243eadf9ad05b272ad497971b6f0f375fa1d47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/446] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 727b97229757e383edff2a8dfd0a4616d8d1b81c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/446] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From f8a6f2017a1b874c3f78516758a4e1ceeb9a5e7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/446] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 9fb93caaafe401a14f6938c48e1682828a524aec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/446] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 6420be10327737df22850a45ad1f99a65d37a9f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/446] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 1a2359896af214414798466f55d267da9c14e31a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/446] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 77e4cee886ae26aac3aa5caaffdd92dcc41fbe8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/446] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c85efb51ed8ad49df7a586f121d8b76246cbad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/446] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 74ab7b66cc0bef82c383cec69551f2ad85dff8e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/446] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 062f0814bdc2bdab5898f69263559e190fd012f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/446] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From ccb8041394c93dfeb58079b47dd91ba13cb2a9d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/446] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 51d3302b8296805aeb3a796852705a7a8fe497c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/446] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 7a895105d6310b15a1205ea9a4dfa1c94e203f40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/446] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 017bf3d2a78900985e585af81b39e0cf5ad16380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/446] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a798dee66df084bf2f29ef61eae7f056fa35beed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/446] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 7139e8d9099450279f156d4dbff866aa02a41663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/446] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 68519e140a9702d7fee5c2e70539951b9ea78b62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/446] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 0141894d73953e75c1e942743d7202f982a7c200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/446] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 6f3c7ec77e25a98594c1fdf610be17231cc794dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/446] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 4319f4b883faf258ac9835a1a827d8e2bda2e3a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/446] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From c688db5a09f49e7881ff3023d8abe4a33033caa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/446] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 8ed082d50764345045f27609ecbfbc0a6a867de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/446] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 72f0e28942b0ca22665be11cc115177e1d813fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/446] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 639fa236f33cb3c30a541c18dd69710f5d3db43f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/446] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 3b586e2db26300717c70db2a3b0854d7522d2e63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/446] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From d2a7ce0f6baab19b4a211424094315973fc99db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/446] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 748e7bf8db0ea010a7eac88167a24960b5ae4253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/446] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From e67e6543ab2ce5f91e62a0e646c267b018230ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/446] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From b1c653b2c80796e09e7df69d7ea111d8f6d04070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/446] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From ab871d654c79e0f5528536e886e3e5cdfd1e746c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/446] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From d5ceb7ff9da0f76934ddeff0b65ef9a339222343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/446] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 1859da451b3f1c6ed17a0539b4407b176c5a0bc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/446] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From a24ce14718682c65d10327b87764e0f8fbcfd48f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/446] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 824bfceef95719d5d472050f01cb27c4eb8406c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/446] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 2f585fd16051b46615d3f0998503cb145ec10623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/446] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 08a32d1f8d50b021fe07d9e3e062b60020b9db22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/446] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 2b85c4e9b5d991899cb1fff157cece22a88f56b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/446] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c4bb10d65c18d24896ae0cf70f3f3b1953f62c76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/446] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 94acf7a72e8d352760f4df9525dd0176141edc31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/446] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 555ffd44dee7550e3db12ac9870439b7d6d97b5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/446] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 37671dea8312d5574e429f159592b92b464610d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/446] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 076f3fa8a1b29a1d4b12c834030983c22530284d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/446] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From db6a3c1b5322646de2389b246955abaf38be6bdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/446] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From ed96adcc41e96a0439ae655d3f5ce5727ffff564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/446] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From ce2fdbb8cd2b101cb9272dcb1c84c0e09a295427 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/446] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From a2f1dcec32fb00cc380641e16e98b982a01d0b00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/446] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 23685dd2a94f6caec161635ad8f450ee9a679add Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/446] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cd02dce1a695c0e1db23d157f9eecda9cf2a231d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/446] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 3c64b059e0f16acee62eeb3f972249b747c365de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/446] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 2496e9d8802b4f6d2a85cf0c23ed45d9aa5e253c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/446] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 823926ec8f9f585249ba6c7b0ccfd0bbcca6cd4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/446] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From a5048c9fbcd7cba866d7f76c26c0041f9fe1d634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/446] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 6bce7256462e0b9bcb0724a748ee10c13753cf7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/446] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 3ffdc39b9e97cdbdeb4cdbe4dea45e4edfa8fe2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/446] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 8b91562dedbee7bdc346d62537a88168ff23dc4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/446] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 8c3d00dd6e5a878fe605c1c6620bc4b020361102 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/446] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bc29eb23f4f523dccd52bb3628a883cf66541b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/446] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From e4178667fa2c7dc47698035138125a0084d011cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/446] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 3c1455b6c5c1b342e8ef8a0162c1920d1573a07f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/446] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 544ae5f4d89b389e9e8e54411fa0742580dba78d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/446] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 7fb2f8b53fb0e4de48d3e6b471d18ca6c1e36edb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/446] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 45498e270c7539eaee1d418fecf5731d1acde90a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/446] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 37d5a2c0d63a27f6647b82d72811d654e47782d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/446] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 3b869e6524ddac679a09f3560f64dbd893c8bb5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/446] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 89b89f3b1fe334b92e8b06ea7be9f12f0a7f14d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/446] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2c46b27b1bedff9394c902a603d24c0d84c7538e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/446] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 6e44cfe1f570b89964745bc5d8d6de0083e2343a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/446] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c2f47b6f3f8705d15ef859c26110069dc3a99b7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/446] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 34e1935b5f62ddd6d16f22ca90ecba82a051465d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/446] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From b72ac3805e6e02f72ba3ae6609c9665d3093e749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/446] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 44503be180bbd6682e3fd031cda839cc111c9528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/446] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 494a2dc3d4856bb6d5eb85116bce38e3bb80c122 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/446] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 58e17178038dc786396632a29ec6f462ac91f657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/446] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From ffec16ffecb184d07eca5823e7adfdd924617240 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/446] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From ecbbf7c39680e1acf6d698bbb1f1c80a300086eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/446] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 5841755eef75fd6b21d8bb783544e516811b6629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/446] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7308b22def3f8fc1ecedb70349297f3e187aae12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/446] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 8a270318567e30252257c7eb3d345fb58d8a7842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/446] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 58c1d35f24aa873378d4f46dafc4f80f61143e76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/446] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From c0531838ad51f0c0316611b6574f3182fc2615a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/446] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 811543b65abfc15b40246d5d931e7678b076ac32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/446] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 674e76e5c4ce9cf2d0beb577a68650576627fc24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/446] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From b45e879af465b36177551d9d4872abb1ee1df796 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/446] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b763de9d3089dcc004dfdbc314638b48be46e3da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/446] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1e9a21928ae6708a087cffc69c27f851b21d79e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/446] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From b0be83fe4389e573c190e50c5b0b80554805c364 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/446] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From c507c907c40aa153607bba46209684e38bb5bb67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/446] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From afaab8f48f7580d38b39c3bc914323a13abb7088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/446] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 3a8da1f9db3bc3f930decb8bdd87b9736e62ebec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/446] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8d25eb737732b68b82eda6adae8b738cd0f85b75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/446] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 48e0e034c76f37c9240e1522237f4c0496806811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/446] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From e0405b774d60a94eddbf6f23de7fb7e8e5a0f7af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/446] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 6c34aa0414dd4d0cac1817354e7e330f52a6b7eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/446] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 853e437b9e9cb7724c2e1b231dc93df48942c50e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/446] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 5a702d6d70f06a1124e6c744d0753f7ff7248c01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/446] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 434bf8cb780c8d0ef3a3182b8dd34183743c6978 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/446] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 1e9c5cce66cc77954a5c84f028e49ab0925bf5c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/446] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 951200c95c3c327171f7f0f7f32186182a671cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/446] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7c02f56fd86b62b8606b7dc8d48b1a37be06a0e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/446] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..92ff4241b68 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 6f6262709ba7f8c1c88ad90f9b4e82a80c18d2a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/446] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..cef5a1fa2f5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c774934dcac159eaebb3c96c363c54f20c8741e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/446] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.17.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cec1fd6c36bbb40b2ff214dbeafeb6e2e3a7c0ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/446] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 4582b0f36bc8cd525a6c281942258a8fc4be9e2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/446] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 029aec0170ee0d09f88c08b0958156034caac9ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/446] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 20543f378e27968076518a99923c829488db3826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/446] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b59ae5e12637dfa775c6d688285e047925f17106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/446] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4947666bee598718f7702c7aeea7130047584f8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/446] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2f7d855b00afd7a62202508864a480a163434a3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/446] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From f11751fcf17339621713994ba98c737d0aaed062 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/446] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 44023edeea5d101376c5c16244d94cee54cdfc0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/446] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 0ba16d0961e6b3317b0ca59e20ad650b5e180d2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/446] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From ef488d49c5a3f1bf8f0cb14abd6aa6252a1c1d2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/446] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 9959d4ad37c80d3c6dade99796fa623f441959a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/446] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From e26aa13d975ab3ef30077cba4d5591c0731862d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/446] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 20317023dc293f26a677ff1a70f7d3c00810c578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/446] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 9741f771e8f69a62df1cca5a1ad97454c33ff6e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/446] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From efc61f7a9e937b1f8c69336221cfc2b8007b0b2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/446] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 6a756e5d24dc5eef43b076b5774f00377af363cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/446] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..90d76074e37 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 099d3b27ad51920d86efbecdeead7ebe4a334b0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/446] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 5f155c92ab419e465c125cb485c169f5f3b2469f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/446] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From e4a7c6ccc8a6022b2773f3e5b7937d463bde1f39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/446] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 367914ebcca0e38b37c6f02112139801b206333b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/446] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 7329fa6748310384d447681b10dec7ec1f0714af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/446] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From a007a196c6a3636fda24e54293a502203d0a9398 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/446] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From aac98736b02f3254e0ba5076f87907565e89c7cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/446] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 548bef7e14f3775d6d4f48c720d72f5717971339 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/446] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 214e24b6f30790183357866abcd38cb8a1425ec5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/446] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 2a5012f067c888c774acea6c15347c89a582cb35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/446] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 437ca8ce66814fd1fd58420096af9eb6275c8c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/446] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 9be8a6a7e02ede5494db440fc047477f0fa6f0df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/446] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 9dda54bbc5ffb4e3c5e9f3857b7b0cc7e368dfe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/446] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 273e59e47b5a7f99ab73cbba6a20f60b25eb49ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/446] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 18d82cb2977718982f3ee22caf0dc7235b30dcf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/446] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From dc8bb69e8c105d9bd5c07aa891886910973953a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/446] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 7583502b4ce15154f0ee2604fd4b5a721e3143fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/446] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 19566fc8024779b6efd7a41e43dfb9d51770a313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/446] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d0e4b911d4586a2d55a941d4dbb6a6e992428e04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/446] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 29f7e16c68e56e30f14f8b0c7bc347ce2d1bec6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/446] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 87cced13c42a9c5049e564c2d56df7c2abf9942e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/446] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From ec802b5a22dee374aafe9275f956fbbee711e09e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/446] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From c07e5fb1ebf2826aeea6cfc0e0f6658ddc7f4bd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/446] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 88d0c259e5abc936cd4fdc0f009253cec1e3c1ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/446] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 0041158d0a6f8510b431c037db044bd7ecf0522b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/446] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From b599b2a39f26ebccbc39d37aff956759c2d5c078 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/446] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eb0953b93049bcd35385af716e3981c05572d21c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/446] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 307d310e062f95d5868eb8f66000c02ac536df87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/446] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 5d03aaec626822f5533ab34950c6482148e340fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/446] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From a05bb1243684beaa394277259fd8f1cb38c1652f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/446] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 37bf4030ee0adb1d2443b0a9dc2dc8ac88250be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/446] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 08b22477f81882014ae3ee9cbee863a5b876fc58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/446] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 548706836440498b79d9b9cf56a6d7302e254dd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/446] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..fdc307ae9f6 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From d60d20fc252279fc89efaea47544f31d7b06c70f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/446] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 8935b56ae278f8180b3fe60b471751a92144e02c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/446] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From fcb24fdca3589972a06953ccd4a83b500c54d397 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/446] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 5943b79a3cb7f7e48113467e7130fade7c85cb04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/446] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From e41597333a1697389072c70b07ebc9be9ef59352 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/446] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 0cce529f347df3d7ac361cf626d88596e1a5c324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/446] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From f6774689eec88c8d619f50f275c5873f70e1027a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/446] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 2f732785199f80fe70387ab8c1e8261092dc32dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/446] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 1a5b76f41f99ee7f979fe7d3f8f111e3d8995af7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/446] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From ee930951dace983103add0cfad6fac2472456b66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/446] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From aa7a4f921b8bfea019b3f7a4fdf3cb7bccd3c9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/446] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 8c80b8734fda296db9795d0fe9b2ee5f0ccfc447 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/446] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 111bb5f8465229327528af575921abd894090853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/446] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7783b4a88d4d4f0c6c9b9849a67a9c9174af3c3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/446] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 42800415626808d077d79738f305e1194d0666a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/446] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 40f1158148011ce672ab93ef0df091d4036af739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/446] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 35ddb08032615b44c7e970b21a996643cdab1114 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/446] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 01f4425f59a95cc376fceeec4984c056b45191d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/446] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 047a35774f6664eca24cd6b5b87b8f3014bddcec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/446] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 78a9ce324b09c18afbb4d027e71de707b6b8c0d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/446] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 06c0a0d579a9c92307727103e8168fd4cde09372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/446] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From c8c2e8bf2b65f44bfb5bd1c1c536687ea5edcc15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/446] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 63fe9a39d0114ebe190df5b3daf62fca9b55410f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/446] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 0e2e5535b6372ada5c0e27f3f424e00d46964072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/446] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From ab69fbb91522ef97742745c500a7f921ce2e4ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/446] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 5ad0f68ffa506d9dd1acaec4206e7a9ee5d79de4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/446] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From b9b9fc4f026c93ef419592fbeb8bb9d2d8cd38d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/446] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From ec4a9b1fd703470e86312e09c5bad8b62718524c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/446] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 461b98b0b621b7ee17ee3bec61850e21e688e52c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/446] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From c5acdaf99f2e53351494a470be9c72d0f35b5aa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/446] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 47a68b1278d9f9c6a160d0edc80ebf238ac7a0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/446] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 7fd6b5cade626e55d95d079c9991017aaba1b602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/446] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 99f455ec71e52055697ea575eb36aa8407dd5e95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/446] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From bbcfa4a8df2283dd7362671895f817b53fced1b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/446] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 160b16f530d437c50a0c3e2ebec10feb2dc8ba43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/446] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 829b8458f4127b2c1855b431d16f954ebe873fea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/446] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c182682c704745b812ec93988ed97741c36de9f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/446] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 287dd1ef3ea90d2e046175ff6e0cbc452b61dcf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/446] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 7e6887b5145d2ae23139ebaa356f4a28d5c5595d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/446] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 976ecfad21cc07ac0b01c237bc4394e4fb83ab9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/446] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From c05675ed6ee5c12ccf6ed9fb94db11b656381fec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/446] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 4fef544d4521d2aedd4c821dc149584ed3d0352f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/446] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 06f013f698e359e38bca6b6510202e755d759718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/446] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 38580593939729abfbe041f324ad63f9241a4c60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/446] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -8,7 +8,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From a56bb255feeebf32110646b57438a3a48c3c2231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/446] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 1467d15021042f4ff3bfe4cdb2b7203126184a7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/446] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 2d6049a7c0db963ad714ee042b7c858e6943a7da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/446] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 0d1875ef47442178d25e8812eeef39284f2f3ceb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/446] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From c8c32000c958c5f97ed684a39798fb482b04b69b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/446] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 0dd2e6dc20c58eec8fd58f01c232f9d6c468ade1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/446] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From eaac820509a717be3dd55df12e0ce8fe7ce0fbf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/446] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 9aa5c7beba3b9a222e7e4e2290907c8d0374e0c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/446] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 0afdcca7d7c7f7d1b17c92686ba6d1313f7529c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/446] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From b1212e8e6f9678f463c9850e8971dd1cdb795d3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/446] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 2e69504023d442c81b6034ed058515d22e423cf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/446] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 442614899d5faaeb4ab69b15cf9e2cf0991f7194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/446] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 7efa993ddf295d05b5e6ce3ab0b560b9ebaccbbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/446] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 065a357c70041a556ec5ad335d8810a6a21e3510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/446] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 25d82f6c4c55565bdb118aba118c5c4301cf7178 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/446] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 9edb111d0c02b2ac2429eb8326639f2710b7e1bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/446] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From b0232c5f30b7d07eb4f0fa63672a6744c120c349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/446] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 0591b2e9e6309246ac8a878dcee47b22985ab065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/446] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 569ca695c20139ac648092c8cf81a65213a53d2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/446] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From e3239617441b2cb0200ab5fffddbf5854cce8a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/446] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 0f0f75178f552f463f490d40c83e9ace8754db8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/446] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 2258346d703dbb9c30203ab30f0898118d250663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/446] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 65af78cc8652a9b10fbd0d5ec53ac1c8b048daa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/446] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From dc03197b80864d624e576addf4895d910640aec7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/446] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 3a8d6ee443619d632871795f84825dd0f3245c8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/446] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From a98544999d22469e30af5e39f07ff6d20ad3c892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/446] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 06a0da2591cbb78fa5400f514a4885b1cdc8cfee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/446] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 6c64737b5c73eb89848bdc04f1b3d2590a3a3684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/446] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From a91d35742bb15d494110a378f79b90308b266587 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/446] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 7abc672f8cb8af0105cb60b89d65a4d02e63e2cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/446] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 7a49b9d75df17357f1915322895879822c74a5f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/446] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From ac4b59d96be185ea0784060f1bb456880c60a521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/446] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 264723c2c77d04fd4a6b57b95602ded4fbd05e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/446] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From baa8497bd50fae6576188ffb814cc22cd17ef034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/446] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 108e83b77a167680246c3bab20ef2b35d70d05e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/446] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 13b975db6e9711edb541d3343fc6ca628d3e8728 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/446] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From cdc545712011e4b59eb0a7b2e50543c195ebc5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/446] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 414e96f440f8bb182a71c9c88341fa0868053961 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/446] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 180555309584d3e9106bbc3383cfff4a6e625929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/446] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 9bca5c49ab73c07273e1fc11a7b02d81f81f04a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/446] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From caf62b8469c42d01f00703c7b2458e1a94fb3dfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/446] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 77a28a6556865559b7504922c5d1cac10278a6b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/446] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 3b7288f85cc5d311c36bf67435b03ec1723a4cfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/446] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a2ff9e032f0545246a6b213aaeaff7ef1c2c8b5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/446] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 397a8a46172a25a9b9855321843f26dbf44029de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/446] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 3966dc344a8a0938073f7221b4a97871e411eef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/446] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From dbe97dcc64d2311e767b1a8f13502c59e07e9ed5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/446] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From bfd49a3e9aad25f6e3d64dd7d401bb986e787acd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/446] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 100b496ea38292db453f276c29c8398499c7c95c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/446] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 3a7d7f02bd152c3e14a3b85d2585cd3372ed4f75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/446] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From f26c62c2f4daa584b3411a81244b62d851a2e2a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/446] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 68dbb25b00a66cfcfe0848f8a6eb02ed9cb5b6a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/446] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cca1a54e6e0ef175385d1916768fe04215c6a9dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/446] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 813be012359031bebef6df64803cf184fed9a161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/446] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 3c0c1d03326485f1d1303caf14a9c6247c667f82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/446] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 24dcf0a6530cb14469f2ea96176a715ae7ee9ece Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/446] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 5fb7d13822eb11ce5ab2b2b005a555b06e11a16c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/446] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2fcb9b8e694547441f4ac5ff84c979781f88038d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/446] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 32acb2612fe9ce066a6193ee68e96368d1f9c92e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/446] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1fecdd6e6b42a38088bab7d3b378c7329a74e613 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/446] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d86ff561155916c4509e059addda73e478b20e05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/446] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3475e9744433ed270a1a700c71137c836b5a115b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/446] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 80bfbdb9c70e590136276a789d1d1ff988556e7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/446] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 95b0dc8fd5a0eb9680fa6c55745901fcf7075341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/446] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From edf7bfefb8475ef8a054970face71335bc1930c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/446] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 8b2ee28cf20d2b2e03ac04fa4693b10cc24b593d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/446] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 6b3f1d3f7ee1735b81fb5b402b4e0dc8f873b6b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/446] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From f3c2b488dd760ece8fc42eb2209c8c2ee755d034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/446] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 7d2a8f51f9fcaff490116b22f379d4983b5dbdae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/446] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From a844e022993389199b4d4f9017c1900b3027e738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/446] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 9975060d5ec2a29336adeaa4a033a0ac3809c091 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/446] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From d4c97ebf1057b5066dd7a28292414250d6424e05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/446] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From b6ba8ff6b92be0518853aa5154fc3edeeeb144c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/446] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 41ad2574966633316896cc183a880d1e67880efd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/446] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From a685b05ef894f338f5ea3572819b95da8cb0282d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/446] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1ac651c34e49d3defcc2ad2676e02ef9ac9f7e2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/446] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 22cd26278efb2a1196cdd09128f8f6ec8b0fa29a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/446] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 236c590a76268025e3dbf8b8c0c300023098f2e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/446] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 0f8519e2611147bc3013ddd4deb456950fcf6ddd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/446] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 9061668b25ff8e2474f2e74d9640e1fdfc1f9305 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/446] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 613f3d7a5979591b396ca42e5d0068b5c7517105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/446] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 3f8c78db701509bb41e4518468c99307878a18a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/446] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 08790708237c477bd6e013f32461fd8720677c94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/446] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 2c117a0537be974576ec2b111d980c387c6db0f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/446] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 1b1672c08a12f4ee51521165955c009b76c885f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/446] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From c16fb1f300c8a46b5c9adf4a3595437c80324ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/446] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 098f15f69ededb036a1361f9ee0c1981422b5bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/446] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From ea59a8a709ba98c52421e337f5710a1947d28240 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/446] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 9e848e526a1db310faf7a12a55f366157e584272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/446] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ef29d81872c42ba65b2f806a6bb5b21e3082005b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/446] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 2ba6d8ab80da2e793b790ea0508c5a426c07e86b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/446] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 0fb17b73adb700e261ba0f685058cca0595938bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/446] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 3d1e0990a7aa7e83fc856c881ab0e37c159e44b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/446] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 88daca6ac1f592d64f5f96ec017080da16f38a18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/446] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From bac9c17dd233da1b6273a432fa9bc90213a30294 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/446] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From dc0a5a2c2e862e792c3c9002e20935d83c45c45d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/446] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 14bcd34921e03b8ea31650857ee68ae75252e089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/446] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0860512cc42eda58ce01fd2d4b9b4a452a77d696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/446] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From c6c9c651d983d9ffea9007beaab165903632290d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/446] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 14dde2a8730dd9e4e8adb0b02e216fb61c8cb2be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 357/446] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b29a913b76b4080f4bc44958fc0e8481ffdc451e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 358/446] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From ed643c7b550595c7341776d3b7a6e514e4cc6887 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 359/446] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From c8dc5f25c9100e9f56eb8fd866e30c4c07350e1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 360/446] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From afef390a71d1052097a9c296be4b239fe463b54d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 361/446] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 860c496f009d443d9d071ec71d8f6d93b73dd922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 362/446] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From f3e4662301db6ee84f6db2a171921418ef5617f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 363/446] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d923aef6c0d1be3ac5bbd5c8a78ddc8101016e23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 364/446] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 478e7cc908960de4f74d30c39ec4ab7dede37e66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 365/446] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 4e0746ee2bf0cd7c7790b4d74e19c751ede0135c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 366/446] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ed7e15aa9192d8e9f848360e0bbc1961d928bb7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 367/446] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From c3ce15ae41a5a1f302aaac279ed4fae5545a379a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 368/446] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From cc005628fb908f75dd33568726c28e0a7a6c3255 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 369/446] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 10f7cc4715e8b18e82a09613203c2e62e340a1ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 370/446] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From ad5e44f73de0e3cc255e12f60af07cbedf3e9d0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 371/446] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 0acf2fbfb1d25fc323ce63d15933c8617e06710b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 372/446] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From f81ed3b9bd270a2af0a68b52550df2a13527b4b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 373/446] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 505806ebe21332d7d7024fb20f12bf5d41b87236 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 374/446] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 2092da50d8728411ed9c6293cc5f97eb87a26d1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 375/446] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 57fb9187c0727b48729f701bedea97f991afdfc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 376/446] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 4a6553de11b05761841a9774b90ed342e8e10b6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 377/446] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 69a2834cceb12d262e526513e6d7453294f46720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 378/446] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cfe42d819d0161cf0b16953c00815cb7d7b82cd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 379/446] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d43aa790a47ffe2cb9b305c50eb00f2d4828f4bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 380/446] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 3cfe652af6b30d40855e01fc86ed62497c3ff6d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 381/446] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From fa1dc315fd1cd9c0f6e199058c50beddb09d0e71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 382/446] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From f11319f6ea9eb3264f33fda490303b12e7cb2817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 383/446] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From e55e82686575532f7885a10269e60b6190f79a0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 384/446] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From afb9fd4a2e92fd0c62affb0fc166d2aa665d722c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 385/446] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From cf1c4c14fe48a2ac1af8070781ed5eca24487e3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 386/446] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 179119718c234149411de62c4dfa12a0d5c9bc7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 387/446] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From aaf2f9146d3bc524605c0301fd6818e49b181c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 388/446] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 0e6fe5dd44ff2f4a1830411b220cfc427fc9287c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 389/446] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 0705cfc0d8575a0d68506bf8ceacd973431d489f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 390/446] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 5352879dec16dd409fabead59cbe8f3a5a4d8e1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 391/446] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 71d2e6156c24cd2d695fb50603ef13042dd53b84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 392/446] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From a6ade5e8565cea86efb9b45109b8bbb57a29d9e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 393/446] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 343f4f36c4c79fcc073fe3b0784d4145bf95362f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 394/446] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 958a4589d5e08eda1d7ad34cd9d82f7eee2e310f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 395/446] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 23971b5d371a35152a732d05fe9c8e18d5276ffd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 396/446] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 7f8e0fea0212791a879f5319dc2e8ba2dcd19d73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 397/446] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From b0ccbc4247cd63dfda394c1586852a3d0f0ef05b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 398/446] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 1efa6f6a0d47e022445a376855608aa9df9719f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 399/446] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 13ef81d273f4dcbd119801e1c4d2cc9c3800757b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 400/446] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 7d86d997377ff246646cc259919238a2b2c6d18d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 401/446] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From b6d7acec72ea9ebf759e6f94eab9165fc6c460b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 402/446] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 0c2dbca98ad39cb7ccf5cd8ac6a82c14f4a78cf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 403/446] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From c371c7f66bd3227093c727c326a0bb203c866169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 404/446] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c92663643377934123a28c934627cd9b5ccadffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 405/446] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 957cda9531ecf41f62c5e52148e130b797b44c15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 406/446] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 895042b0e34fe01369cebdda8944b66661457644 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 407/446] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 82355d547cda7b587006aab1d3a460f4a9bb9715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 408/446] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 661f50d29e3beff0f174923e4b2e545607113169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 409/446] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 708f2d3fdee38966b0dab608aacf21ffe4ec8410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 410/446] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 112525f2ef8a727e4f5095c16d74b71dbda11ed6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 411/446] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From f44dd529c83728890d7ecaa4d5d07d5e86209c5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 412/446] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 4a17b0fa282d6c830f243e700f5a90744fedf1bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 413/446] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 4d1f17b21137766e8169c734d3224125c623d4f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 414/446] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 21ddf23455767f6daab99abcee18bf252f6d53a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 415/446] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 51e97f873554bc1654e197e762ee85f101cbafdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 416/446] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 1e0f3a68fba3ccb3727f8fd16597c72b9dfbbd2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 417/446] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From cc30429cff0fbaf4d8b9e0be2708c245639c2f3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 418/446] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 91f2cf33121bb8dcdd88f5a6772c90115410b3bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 419/446] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From fc0a072fc3aece40e2e5139e57e47d1f92b6b1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 420/446] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 087ba8d0e8cef44eb7d640ddedd3e691ab92254b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 421/446] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From a659ef4697b7cce3dba5309a2a17ecbce67bb335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 422/446] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7e71ca45872c344af1919602d02cc021d7fa294c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 423/446] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 12f71072694bb82a5822266ee7108871fd131bcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 424/446] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 3b8832c694b9a3ae0e03cbb0163a59acc9381100 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 425/446] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 79368f76cecb3c9c166b0789fb4c723ae952c813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 426/446] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From d927eb0860e796245211384434d42ce6d377bd01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 427/446] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 60251dfaa7e1d4ec107a4ee6cd66f0e5fe3de8b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 428/446] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 14ddd2a36d5641b774ba2609159a2abe8ee44c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 429/446] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From fbbe4420165092856eef6dbf915b19267f51f822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 430/446] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 7eddde90e8ca9be215ffde1f71e74bf055d0f739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 431/446] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From c9b43584b0dbe169ca38eb0d40b07f3383ef3ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 432/446] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 5cc8289ad1d4afba651a31905837019a6d585c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 433/446] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 562593194b8adc6a609c7592d76262f606c4ae9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 434/446] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 3e7c4812d01c34a9e2e316edabfd985c3753c40d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 435/446] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From af02d82292e59f8f7011d01563e407729062d77c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 436/446] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4e57775fb5a6fa1129dc77a7025045e67f3f77fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 437/446] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From e09e597aa515701d6de62d45a77e34c3db4faf5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 438/446] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 0c745169cfb971fd77156be430a4facb88276433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 439/446] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From c0e2b86415a3816105b5c4ccb6c867b333a3ce14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 440/446] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812..7a68cdfb46e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 34cd24e41284bd56292e52fb18d24e423a03bbe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 441/446] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 3e4620967065d36f23f6747a0a39e1d0ad395385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 442/446] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d7..2e25f76f571 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 81ae4ef1b721270b648c9cf914e704717f71db2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 443/446] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 5265b47bb492d139c7d71b0e0730d3b8ee670b36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 444/446] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  3 +
 8 files changed, 3 insertions(+), 219 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index 8baeacb8e05..313209875fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2d2338a8b9b..3189738b6ec 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -57,6 +57,9 @@ replaces="
  gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From efc37d79e51264361c21a35bed1b3a6c8be24aa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 445/446] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3189738b6ec..a76050e73e0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 402bb63c2e08ef04847871e37c3f42e8d7cd5aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 446/446] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a76050e73e0..c238e4915d5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -243,6 +243,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 565567 bytes --]

From 1dbc0661f6db2c6255e51d683986c33c4d7e6d4c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/445] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index fd1a20b0f64..ec4a77ab03f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 1bcd025138d16fc9f99ae735247a71289a053e6a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/445] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 48486b28f3b5337dc76f9298efb6bc10d5b8f20b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/445] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 62ec2049fb7818e913dc93256512c952263c1371 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/445] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From c08b1390c2e3f6334d43f1ad4e7d70fbcccb4467 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/445] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cdff973233f8764a6295bd30e2acd2ea1bb0f7c8 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/445] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index ec4a77ab03f..a95881156a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 52c3394948728d7b8c849068276f6cd9bda8f53f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/445] libressl: remove package

---
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 6 files changed, 134 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From f3b3fd7d55084b64a1c54c4d2ad41d79055233bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/445] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 3091b9ab68c3d51bdfcd98b24ad6a359e2c73a8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/445] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 4a006109be5375cb7846816c0c45788c573a7c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/445] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From b08ba112fbbf05165620865eb9689977d936b9b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/445] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From f1014804907bc30d24b208254f2113d3a24631b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/445] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 453c616cf3499416b606b0233cc2003617351994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/445] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 1bd6074776a135e1c3aebd905eed35a151565a9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/445] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e3f1c09b1e59d2e4e4ae33be05e53c1caf567c4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/445] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From eba585bb36ac1c69e14a32fc31f5fdcf752c1392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/445] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 7d38deb1a4740b353d97783241b22fe70b5a1cb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/445] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 82ba21fe42396fe84133d955f0246dbebbd0fd44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/445] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1c2438eca54c278820f0cf5c18b0e499882747b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/445] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From d38b11a67638bae8737a98948427e01c0a689fd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/445] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 972d121a9f7e871e57347642eae13894f921a4f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/445] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e904711b79561274594d7a4c219c2651810680a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/445] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From b04351f9b60c2bb85d654a4629309b9e051639de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/445] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f0f3cc4f544c3441998e0efe39f6678b0b6da609 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/445] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 1aef1c953f0625ed50db859b9624bedf968f6e86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/445] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From b3c1aebaac71b3e967f9f6b3c3e234d29da5a312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/445] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 04f6d849b106a47ac37ad0e1920755acb3e91d50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/445] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..d3907ccc1ec 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From a6a8fa2a01d7ac6a968695a3114323be43801ccb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/445] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 37d2a0d650604b45ea9bdc433857415d76082deb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/445] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..5497876ec39 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 09f65ff146e74f8e0f019e28e865e54bff9134be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/445] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 37dcefbe7777da368fa551d292d50d2ab48f4f93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/445] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 504ddb6c85447f4a00481bfde82a79280a475a82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/445] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 11c0b50c70b271e6f1eeac8a24e4260ba8e8e7bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/445] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From efb00e0fdf9d720b15a9b5a84a01c2eb42b97bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/445] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 448283abcb21b62af65aa9a18b58b19c22dae345 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/445] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 60aac20dbf109bd86e623396aeaade2070f2d7cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/445] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From b297b7eef57bcedd76f75784f5bc9768dbd6c35b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/445] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 397195b45a511845a59737553b8f84b8cd5c19b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/445] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From f3582b2bc86c21128ace3b8bbb8755fabcd920a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/445] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 52e822ae12a08a52bb58da263e887de69ab60d84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/445] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From cc4d68511c3c415bf5d2e25ac5d5279f7401dcd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/445] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 32c0c97d46c076a3497b90e9f66f22c79bf5040a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/445] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 3ede21de5223885a0434b2af8d23ba6a2419313f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/445] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 3c70b2def922893a12e1a2ceb70c06d17bfa9256 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/445] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 0658a48b6fdf454c1434797988fa3c9b7fe6d2f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/445] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From c473a456655ad651829c7ee741cd99f5c3d9dc0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/445] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 081b7574f30f0663bd419b70e2e0f186ae7ddf9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/445] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 913aac238b7115485916ab792f88bb76d8355c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/445] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 8a9fa3a48d157f5b6351bd34fe9a1fc8f5d30f5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/445] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From b9117011d42d338a40d35ae77e529b7fd773dc4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/445] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From e3dbc1eb102107067bd833588a2c67af0e8c16c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/445] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 513a3fd5e76b60cf93f27af11fcfcb6d226fa6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/445] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 84626e9ed4bc99f300600f243b87e10594e04307 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/445] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From eeee1520a9f3803801e9c3f81aa80942d152adad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/445] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From f802779c3e42df20c0126f75fdef66fe4e1667c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/445] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 67dee40c53faa941694919649fbff1b1e657c366 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/445] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 78d3833d82d8a83f03dd55007b1abd9ae9a7e219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/445] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From dbbbeae65730b61c0d69d010042108ad9a17a4d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/445] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 36adfb7646d242c67223bb4d0d242651f9a486e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/445] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 80c5e0be708887f26f3645f07948fb5a98b99226 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/445] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 75115ac7d32351a9665ffdc5b85eaf704f7f9ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/445] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From fc593a5ffe836e3d6c9de2e663c3e235a710cd9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/445] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From ddb1b9d7bd29fa299141568d76eb42798978761e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/445] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From fe34bc030915468a03bda282787d42811e24bd05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/445] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 95ca660c129d0f12147f32dec163034c122ead82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/445] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 20535619e8cc20cec11bfe3195b7c6aa60f889d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/445] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 6b96c485b581638b3110e075ee8deef9d821be08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/445] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 3f0b0a24774691f579ec87566b729a1e74a5d693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/445] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From de18965ae93c721a6425f6c3a90d598116c1c7a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/445] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b3079b065688b4e16b4aa6ebf63a5879d20b31eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/445] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..089ea911e08 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From a4689dead85631291dcc22e9c0434dbe8d501028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/445] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From e7c3815a716da2d7dcab2e539ca43a0f44f467d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/445] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From e59db0d115b0b092c71b108bc4c16f815dfdb4b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/445] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 66c0c1bc8911f7fbad954b76ebbbea8518db00cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/445] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From e192401a67f204a9b7b681fe95435c3c3f513930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/445] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 4145df1eea1d52e3563d24f9e00697292082ff0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/445] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From b12e65fc9b4e30eab3f2af282ef572e69d4282d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/445] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 72921e740de47eb42ac6aecc900b695e7057a2d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/445] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 2b1d0d36d0d4363c92df06fa9eb64a90dcb00548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/445] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From c53e2699aae8a6b7d80a577779255b9532292482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/445] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From a11cb2e8d9d07dd70a5bbe76a9aa981b0865744b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/445] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 449222dbfb3ea3dff9ad1140a1ef1884eb11516d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/445] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From d7e3c5f95ca60d6c61af05d094cc26f3a9d6372d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/445] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 230fdb51c247759b9c76d3092f36ca718be88188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/445] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From fb66f0bf77606253861089c0f43c4655c7a4d73f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/445] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 05fd7ac98204da0226c53b92c267401daad59d50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/445] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 2c7345b6010335725ed02374b93638694238a179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/445] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From aab96dbbb2457f6bdab93235bcb734b186835972 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/445] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From fec2307a59fc8161a56be44d7292d5eb9d143eca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/445] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 988a086957a6183c3f785948cbb1540407f8d19a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/445] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 9dc8bdd0235544d6982d65f03fbaa76d5515155f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/445] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From ebaac785407ac43e034a32984f04a8879b0a858b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/445] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 545c5f99359cb6f7e313bd181a2c3bfd22211627 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/445] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From c0968d374c1571c2919cf3f3edaf85dab5ee3b6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/445] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..e07403e09dd 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 93e037998314b16bc008acb836ca32c5101b99f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/445] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From bb5ff752bede3c47635e7245dd5d8a59cb43d970 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/445] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 66c75b1eb6ee4bf87a7058f651f412ac877c76c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/445] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From e115cc9ef2994f7209fe43d6d688cb72505ca42e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/445] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 3ad15668b2c245486379cf3367d7193a7d0837c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/445] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4cbc98243d0df51a1745b23b0b685dfedfb46a03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/445] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 0fc90d22c13dca196d27ded8284cc683de704368 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/445] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From d489f847b47bb58bb97c4a5ae90cd6989877bb22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/445] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From cb3f7947d4ce03e2c357b1626a62d999869779f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/445] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From d164e9ba2732157ba94bc4e14b9215d31bd8828f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/445] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6849e36e4b8f13d8b67c9b624482a1c552b9b7b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/445] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 976d19a8c227a55553bc5cbd42233323dd03d5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/445] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 7ae0ff2738cb67d30837bb54b687fc99ad039a8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/445] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 5427a3927c18c56d005018b12bad96b4657064de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/445] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 33fbfd62c9d84cfb51e3e7584502334b61f46b2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/445] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 875e9f17820d11a00620304add08475ad58b8012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/445] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From adc5e7078483b78c73ddad0aa63687eba8303e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/445] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 42bd12f60b1ee2eea0f46ff662cdb16b90622e88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/445] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 092a66684e60d96988137ae7bead57715bebd475 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/445] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 2b22f25c0a08c21c9d1e74ec635885802d0c07e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/445] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 7ed76fdf55e8f11e3f2725ca74d14674c583a9c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/445] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From adf588ba9fff7d908cb9e67702b42b84e71658f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/445] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4bc11e998121f653d0dc8c68af6524a91fbd3185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/445] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 383a3600c20457cd8a0612062526ffd1f71c96b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/445] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c8837178c3fe99d8a1a636efc9419f68e4e23f8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/445] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 58dd856a5020888ee90c1abf0320efd931c039e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/445] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 5ef9ad2254853c4732e4185e9e9c875a12bd27aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/445] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 16c9bbeb2137b399d5e74646c576f440b5977642 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/445] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 65a26c8e64dbdd2b59da4d379217a33087aa4e8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/445] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 4bf7ed6b182a696f81dc4c16aa74495e5e814bac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/445] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 7448c86cc5e43ff803e962c989021240cc367a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/445] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From f957a3e561c84b09881096c48f0d37cb21522a7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/445] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 8cddcd4e09819c46fb2c88de94d1e062aa7e402d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/445] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f2a6502d4cc20a176cd8a3b6f553a4441b3a0be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/445] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 8ff9d71627da019324a5d9390d1df3a24748f069 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/445] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c205dc89fb5f1d14d78badf7d65c8915adca8f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/445] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From a7c4f6ba231da4ae171b1ed6a1a8a291d69baa5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/445] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From dffaf0e4dfeace88be3ae5c9a5b90326f41d8bb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/445] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From c0c77c0be3f6bb8f120dc59b71cb25b04b498e0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/445] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From e6b48cea4e9470f8b275b7ff6fe839ae37eecc61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/445] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ce71db4239047a407a550775cb474d9f469cf71e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/445] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From dd79b3e94e16398faed884e4d6762f21e876b746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/445] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From e6e86a34e005f7d3dfe7c3a6913ff22eb0e83112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/445] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 68544627518149ff950860d84b1e8d9f22527d5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/445] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3dd530c003d107f96b638c8d0b25f5dda9000238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/445] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 75b0ea90bf81b3302e0654ba6624326e7fc45dca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/445] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 177f6c6f74a458fa17c15caa1dea47624df46064 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/445] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From c654b9ba6c1f1876a8a68cb53b54d6d2315e9b56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/445] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4a460ff99bbcd5aa5d862f9652966f711855b7a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/445] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From d75743642da7d4e62ccac5bd0d52662f29396fab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/445] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From f79346a4d234c1c04bdf83a411d97081b8c2e933 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/445] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 65f49b15c458876b7b946cc9fabf2813e373e0ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/445] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 50fedfca200a84b5a6a5b01f2d345624ef265e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/445] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From e25e94ee94bcfafa7c31d8654dcef4e789cf037c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/445] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 0324b24e93bcf359965ff81fe8a8980fd9b4cea2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/445] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 0a18378f6a427470a0cc163796a6dfa621f98c8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/445] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From e5ae8c978f2e103437f95ad712221dc05da8b00b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/445] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2e3600a66ae9758a1542d0bbbfe16b250fc9cc5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/445] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From a114f4b4c565f6852bf3d0a2f84d7bb2f67a8554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/445] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 5bee8b1bd3170c76930e7dae49f3c7b5b3853c8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/445] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From bcc56ea83dbbf43ebedaedb50f2d07dc04680795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/445] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fe41ed39ecd42f36eca3b5db0929c943c6490b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/445] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 050305b3da9ca0ffda1d28c3cae813d4706f41d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/445] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2c10df32db188420273e295f693907918741fb1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/445] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 4d3d3fc4f985ce3aaa382ff7e19364a20ff9eeb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/445] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 1639e8cc9038fc237c7f4f0574b62f91cf5988d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/445] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..4cc28852fb0 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e0a1d1214fe6a88b7d1d0e40edf6396dd5aeb49b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/445] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..92ff4241b68 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 107a8f73b05be1853a95c60da98f7ae60064a848 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/445] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..cef5a1fa2f5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2454e56ff1243912f586edc9473b1e11f2a05ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/445] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e25b72795b129d613f3784280b949688c6ed7004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/445] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 6e530aebf846351efbc8d5ca1e82a7102c3d3c11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/445] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d1aa6f7cf7882a43925eb9170512fa6222084215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/445] lua51-luasec: rebuild against OpenSSL

---
 srcpkgs/lua51-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
 pkgname=lua51-luasec
 reverts=0.6_1
 version=0.5.1
-revision=11
+revision=12
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
 depends="lua51"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4463567add8dbdba41382082e17d76b396725333 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/445] lua52-luasec: rebuild against OpenSSL

---
 srcpkgs/lua52-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
 # Template file for 'lua52-luasec'
 pkgname=lua52-luasec
 version=0.6
-revision=10
+revision=11
 wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
 build_style=gnu-makefile
 hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
 depends="lua52"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 020d0775e2c3ccbd3c513d663556df343ce50423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/445] lua53-luasec: rebuild against OpenSSL

---
 srcpkgs/lua53-luasec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=4
+revision=5
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
 make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
 make_install_args="${make_build_args}"
 hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
 depends="lua53"
 short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 813a7fdb2694c5de3827a9fe2a6b49c7e563153b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/445] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0b9ccd9afdf6789e3b55a3a953e58a72e49c2751 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/445] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 17d3abdd4bf9f01402ba946b780e70ff544f2863 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/445] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From ae89bd12fd35009a838afb51fad1dd090f18db9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/445] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 355299ec091c1b1339e22b057aa1bbd5676e4b33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/445] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 5326cdeb4039f50bdcee406b28cc6589a5596693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/445] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From e3460e95b88fde1d7e9b486e13fc2f1f34182914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/445] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 86e6bb96c6bd0a8438bca2018f472499443d2a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/445] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 4aaf1d0863c85558029242ea4d80827558be40e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/445] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 2d7c929d112e570106b9d0fcf414d33e73e2f712 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/445] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 162cd4ca1fe8e37a046515d4deec7f53d760c036 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/445] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..90d76074e37 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 0955451a1f010d95c81b8fae8467e9b25d6b8627 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/445] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From e934be3fe1fd8c1139bbb1f6a3d1b522ea1ed62d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/445] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 97f62253095708220b5ca81b689b29024a1a848f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/445] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 036912459a8bb5a65466322377626600b0556fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/445] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From c0158f0e677764325bf0495f942128362d1d571c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/445] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -4,7 +4,7 @@ version=1.3.2
 revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From b0e2ed421eeff9582105668089f21fd2a3be727d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/445] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From f48db0ebb3f78850293659b9bb9b9e0fc0c8225a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/445] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b1b208b4b7c84c907c1708ce0cc2ab5712a13406 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/445] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 7ad0f2466e69431cdb2625a155829875a01a0c2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/445] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 064d53ec0c49e6ccf4f6e0227201191f371abcb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/445] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 82d039647624017254ff38bffc6b9468b41441b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/445] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d63df7bd4c1..a98f9f4a651 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From da2f7b563e71693e670aac9998c329dd84686929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/445] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From c2e8f0fb3e5cad01db8804ee625bb02b72b14f06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/445] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From a5425dcfb2691fa6e8217a137be43decdd6d86d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/445] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 19e6260e6614dcc16d4b4029e1de656ef2ea7c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/445] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 4ab583a8afc7e1f203617e73a72cb13936da4278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/445] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 689533310a3f1a4b1fc62c7cd54d01c6c8bf590d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/445] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 4c48cbd88b054d3d18733e9d58becea066f13023 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/445] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 17971f2d821d111d10ff7cb24729300b3913a066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/445] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 00f4995c68b0bbb49f24b826fd94ecf8c9ee202c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/445] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8bb013101c3e8737a7208779c52eec86bd9b99ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/445] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From f38d3d0f2c80a50fcb79b891f7226bb9d32714cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/445] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 62fb0437843813f7bce6b2c08ff3db0aac71165e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/445] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 9cdb3b37d13a496b4b9a9704c99b189ddb3b6a2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/445] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From a8696d65f96175aacdc9f11ae44aad53f3a92985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/445] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 112dc8fa1e6f7ca1b6c6d0782d4fdfade41b7aa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/445] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..e6a98933f0f 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,7 +3,7 @@ pkgname=nginx
 version=1.18.0
 revision=3
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b3b6808f45d0a2cfde7d3e0ff625e4618d0633fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/445] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bb610bf55195e5683267d0e5c090c51a0c325445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/445] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 6d7270f24cde63497900c7ec1b8a86c207584d64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/445] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 3e2d0558c58552bec762e90ebe57af3a5e7c90dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/445] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From f3c071e72a5ca7fa97ea34abfe679de8d4abd1c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/445] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 2e8529ea60747b0a86ace0be4f6f05f67ef3e199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/445] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From bfd8a3b6ad2bf6054ac28d138da94442fe0cf46c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/445] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..fdc307ae9f6 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 499afc4c678e3946381524125579a499e5eb91f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/445] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 9e11f7dbcab6cb170f897e3eee6ecdec5e3b46ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/445] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 4b58fafd0bbc595dfb980b904748d3c21c767611 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/445] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 1f057fb8e8ac50c03e833c41c733bf9706a14d08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/445] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 12dffbd12886818fe5339e1322bfe3ee729e8b25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/445] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 77376bfe1ae8f628049d4f1cebcc493cefbe374a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/445] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 389612230e61905b8f9e0a57c2a10ce9bf6c9847 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/445] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From dc18207a9866b65ab99b7cebf72d2fb0e3b9c06b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/445] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 72de3cc953f5466d7f4997acda46235985183660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/445] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 64c94579ede7399546b575599dec7406c91467c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/445] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 204303e0c295c1546d7e2e634208887cd38a1b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/445] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 4e79f1295aea4c8a32f65960afd145f8f3bd4c50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/445] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From a3c8b47cfe24c18d80a642eec58abd64fc303400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/445] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d93c3a1194dbdd8cd14d9664b6c5a0f16590eb50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/445] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From b2314d55b1d5a65e3124dbee24cb8bada94b4cc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/445] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From aadfaacffbb8226a099d853406a852e0950d2bff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/445] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 0779e6c423df9207422fb2c66cc4914b53a5def4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/445] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From abc1fb96ed9fa202eda30f375308f36214c084cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/445] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7f33a79bf0e67f420a68aaf7497c2d5c88eec691 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/445] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c75da77b39eb723dd325bf0a53465e7605f30205 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/445] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f15845b1d99b159a65a72f682d03f5a81fff4204 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/445] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 1abf77675cd1380133d70c4ca7d7aa5324203b8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/445] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 382887baad7504be902de1d6d4e670543ae4c429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/445] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 7d82e88fb6c9a3759886a443e8bcd37d5ad20733 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/445] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 3918a1bf398d85d116d5c5d3f4bccb42a21bae65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/445] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 0a0bef2b9456bf1a745c6bd4b25d6be9335d7277 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/445] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From c7ee412d6b398b4a2cf133b155a8111610272b0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/445] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From c10396a59b674e9c27c4be2a9591d0eb4abda087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/445] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 10338f86172355812fdbfc69e028089604b14e71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/445] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 61536140f6387ac5cd9005cc49f1cf832bd6fa5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/445] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From ae6be4f254ef5a7ff7cab0764d9e249947c9bcfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/445] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From b0728071d2edcebb1cff68634d6b7cd7d79128a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/445] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 4fa9ec3eb8b2bb7a847972c336e76bdc00069ff6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/445] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From fda6ba0748523a0abe0b6468fe8f99b5197aa9fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/445] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
 revision=1
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 0b5793df07d4385cec0d02aa691b05efbb57a461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/445] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 90582eb14888772ad9dd3f8167844d093111d0e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/445] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 6b62dc43c0272ae858f1c3207ca2c371c8ad075a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/445] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 3091ece2e4c7afcfc095863b329eb799a14ad85b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/445] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From bc1831e1433bb01d43ac6501c838b2c48d727994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/445] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 93a650e28a36a1564e23a66b482b8e067467c9b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/445] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 02bffccd6b2ab43974e57770835c75a680a182a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/445] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 03c2b64e0029575b8bbfe039e06dc2420deb5ebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/445] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b9d8d54ca5d995bc3c93b40982940185ae78fa75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/445] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
 revision=1
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 8a09cc375697e66d507cb33957f94ad4c8efa343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/445] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -8,7 +8,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 348a72d2de5f9b6f8f79ee063600f47dc0d137a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/445] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From fb91ff07081917cc6105c9992d8412d1a444da5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/445] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 6594576be7fd9ba12bd9102d991e367685d3d6dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/445] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 671e2fe9afa273eb3145448383786eed056ef1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/445] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 359e52804f5a352d3077bc3878fd0e2561440ad7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/445] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |   9 +-
 2 files changed, 6 insertions(+), 423 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 9907bca6c3a817eaf94ce7ec403448338f9e0176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/445] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 66f56fafcd839c06cfaf00652db96e203ae6d837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/445] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 9ab3cb1877c0aadec3da79dea8aca2f01d0de576 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/445] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 1542f88279c7880fc29bb51a98a40101c61ca483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/445] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 8bbad2ea1cbdb79e7de2a5db269aa5934bfd9661 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/445] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 5a1393905e194acffb31ea9585dc331d0b8d4de6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/445] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 07c142f394315ed10e94ba9cefbd326927c0f7ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/445] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From b0fd04ba99b940045d950ec06ebb89dd791ef66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/445] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From f78af134a164713234f51c18e99a8493ef883494 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/445] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From ea14ff0f5d9084d173e2af1a2b2ea80234a42b8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/445] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 0fffa724aa58081e225489d1c9a0416072f61c2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/445] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 86cf47d7a5e81c9ee18a510839bf34ae708e1f78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/445] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From c47a17a19a23188ac3fa2c42892215172831aad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/445] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From afc84eaae5964e7210278f64c78b0e945ef8ef7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/445] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From f213309f8861aa4fce1ec0bc7eac810bc64087de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/445] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 33f9bd8d896d31d8560f26c4d3f8f365c93a09bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/445] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 4c92425cf10992b1ad8846b0704091d1768feca7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/445] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b6c87c7a6dc6f94b6e5d7834d049d963141e39d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/445] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 2ab86b24862c3d4b57ce4684288898a960ee27d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/445] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From b834c608de784db370f8dfe1838c4817b02db2e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/445] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ed7de48bf2a3e170b83cdfc8facad751c9c7c20d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/445] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 9f0b70d8e1cfe6475360d523258d77f71b364a0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/445] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 3d72a18b79173abeaeb9eefccd260ee359ebf9f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/445] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 4bea769235173f6c071474975db2d4e02435c6ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/445] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 9696c30eff97115c84b8471022e06103574e0462 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/445] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From c6b32753a8a94fb7c61ce75e019c5e5e4ab3c5c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/445] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 877a6daab6c8bd89eff479992132190f772e94ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/445] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d854961ef951628f0b039ad02ba1f5829736ac42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/445] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 0edbfd6241a7b434a0c7ddc98a4942f56f6aae00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/445] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From d5197f5fb9ecb4fbff7dfa131efdc1f05a1bae5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/445] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 73ecb724933df9ec2b05b57f9159a19586365f57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/445] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 3f0a55ba9f3bcfb9757ee69f33f53c618dce9aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/445] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8e012134fac 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 341754e5d36a8bb6311ba7ea69e612f3d9288697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/445] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From b19dccc02860bdcbfacaec5d4d255d56576c2357 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/445] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From ffb581aa9e20ad8d83342e57ebcc5f98a0c46083 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/445] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From e954ef321801d2bfc9f6780df91ffec0968c8e23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/445] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 1d6af5668c275c7ad46603e052a46d93c37e32cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/445] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 8ca156a7dc048d738632c9f457d43c8a695dd7bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/445] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9deeda7e47f132973d9ca6a4961cc04832af2b9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/445] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c220bc73e830e2a73193a1214c47436309fea480 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/445] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 1f01cec4c5ce54f4c53c62a35e4b5b8af6335e1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/445] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 0fc4e43555f0c3995e1484215a84298137101b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/445] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 00e57e6b643d67adfd77cdbe6b5ed782b7ce74a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/445] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 37a25b0d1a37222ad7e908392cc566b6535cfa10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/445] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From ec7fc63e0b241e7e1d16f73b06b16b7ab50be9f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/445] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 31de04dda8da9ee19ae454765142c1f11b2274c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/445] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4515165f78aeae8f347ae67631e4e3fe0b3a8288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/445] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
 version=4.99.0
 revision=1
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1d4eea32c69e0198e3d82de249085e759db052e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/445] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 9a2768820741a65d5eabb73e3c38285da72b9068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/445] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 541567794f7c60cd4dcc19dfb4cb3578b0f155f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/445] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 674095331143d5852b9f3e2bc1846bd44a529e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/445] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 8ed3f518dd42514932aee08974be4be5ae6c52c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/445] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0dd11138d2dd905c6110496068d4130cfa49caaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/445] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 3876444bc42e2fe507d6827cd828e13e5d938c37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/445] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 404115871d60afc65b7a9f448d188fe84642ce66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/445] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d6db5e5dd55560fa90452629ec2059f8cd012312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/445] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From b4e4dd22319cc5ea1cdedab943ca34ca8c7cd803 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/445] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From e1730c52fe4519b7d91d4839ea3df0f3a1858a6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/445] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From dcfc5a42cdbb65cc626e9a497a43967a46f28794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/445] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 95f0d44f3001d86e6f0648aa2944c1a71561d570 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/445] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From ef48e7ffa1cd591de64cfe20735582c1c33ad466 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/445] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From e283db15af10fbd223f7079a272df3056161e435 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/445] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 89753913e52610ac7254e4aa882e1aa0c019b482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/445] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 4ad2c577c137115251c4f26313f31e67c1146e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/445] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 324fc5a75288fec15f096c1343b2007bfc197ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/445] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 436ae06c1a828f94530e75f76f0a6f0c5fa20974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/445] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 624096c0b5bf3bcb6587188597770fe29c9b3181 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/445] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 5cc9967452934d0a87f2ac239af6261254af3f19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/445] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From fbe04d533909fb85226c21fce952153dd658b98e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/445] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 0d7406348e4e121b1a88731cdd3f00b55733c62d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/445] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From b5eb9b8482def3b485fb5f178fa4942eed77d554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/445] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 0ea75fa965cee3f61f0ac78f69150a48d007cc75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/445] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 46b14ab47f9534cc5ca612d1f6d02ce2c58c5cb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/445] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 6911a9f98ecce3512c864ec6044ca560cccc45d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/445] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From b7c52ed464a787164d81d6c6de6c40b61c38f64a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/445] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From cb843f4073c599a4a7221e9fcc85d588df809d00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/445] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From f935e78c0fdee1dc64a869aeb16319ab5cb5e318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/445] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From d40aee2cbaed1ce2b6da6a68bae9f855468e2489 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/445] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 3311034cc3dff4b2dd946633501451d3d1a2b330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/445] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 088deb0a30e8970524813adf99ab4b8b486aaf8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/445] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 59b512d357c77ed0bd27fd79cc64c5302738b313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/445] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 3da935cb258776bc6917ea622be4e7168d7460ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/445] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From aa445868874f9a5ba4037cea5b344dddaadc4069 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/445] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 1153a96bb71e49da4c7c942c22c5fe8d89b4d410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/445] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From bb0473df5d8c2eff6c290ee89ee505f87ae56840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/445] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 10d023ea0881d7724dde8f369449a8a685f37dc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/445] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 06bc8e5531e22a0ccf9eff500156ed121550a3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/445] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From bd9ac2da08f195419d908499e6c51598c0ab09ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/445] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From f0a4a8c22c62ea5e02ea22f6146babdeebd4b483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/445] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From c0e80845af25a86e28aa26c2f1de84af0f2b66c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/445] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 0889fae219536fa27550d0511d1ca5c7c777b0c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/445] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From ff737841ab6b024c61d11d6391dfb3c6ff530c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/445] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -4,7 +4,7 @@ version=1.4.4
 revision=21
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ff0e51845e0cc508bb574a1b973073e787c2f61b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/445] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 3b780abe04a7c20d5c9b177d169f22475e18f389 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/445] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 6d7bd87bcfa0801c230cea353e97d198a982b2ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 356/445] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2f1c04c183181a03c5040e64f2fb390ce6cd7465 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 357/445] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From a1a94ff1e13fbf4285ee010efe8bd6bdcfb16a2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 358/445] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 6fa2f75cdc377528627be775afc3cae333762284 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 359/445] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From b7dbb91b29b8d6b2f473e81d8a8c81a5552c2383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 360/445] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 77126e7465605777b9b1ebfc68b3254bd7cb7b20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 361/445] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 8b6c7952a6a891479377d086516d1521246d4e12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 362/445] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From e22a66a9d5c3672767f349b297a91dfbd916abdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 363/445] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 998b1ececeb467e14b4d85e589b7c90b3bbb2918 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 364/445] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 3492523fd566d53c4f607c031ef8e9a084c93633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 365/445] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 263688513451d01f79ac0ade9d2d92a9eda569fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 366/445] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From d1ca9c366986b23ce45fab442f6b145a1ecfec17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 367/445] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 631a6a4ab767631cd44f2ce4d5cbd6ec2972e2ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 368/445] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From aea54aa75aa6b5997672b883ecaa5c5bf9031a44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 369/445] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 14d2928a8d8f77ffd38372f9ff6c633b1c0e1918 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 370/445] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 5782b8667cf959523108d38e33750ebf67c24a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 371/445] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 061394e0a383f96f818813a202c075b71b9ff213 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 372/445] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bf458aa809ec39fcb40e180bde88621f49a8935d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 373/445] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 4d222671a1884892788e49f80f98e0bc209dd643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 374/445] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 708b367da3e14938c4e8f6f26841c166544217e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 375/445] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 8931df94787d0dfdaa58f2efcd01dd81a51f9a48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 376/445] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 3f3448f91e69734de9fb5d6996ecf55a3486cc02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 377/445] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3a6e8c7d311543d4d4a0f6734ae33462355c4b16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 378/445] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 8e4737421d9b21acb3f0f25dcc36c2e1dd7b5208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 379/445] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 82702380b07094f23a02b46156c511f163d28920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 380/445] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 6d2e5348076a81228c0ddf079d4ae566f7b59d21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 381/445] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 3351f11fd64f2f91875ce0b1d399f8b2ea1ee71a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 382/445] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From d757769ba655e160a5ed8f99bc27c710922eba11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 383/445] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From bb601330ebb99b1ab7da0cabc3464b7f4b83bfb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 384/445] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From c8f866ca73c0397170720956cba312ae84232904 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 385/445] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 67728630bfb5e346af6488197ad571c643d1fb0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 386/445] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4ea8504b89189aaa97419bbe882f84b459c64d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 387/445] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 4e82f58258100e7a6aa4ccdacf78771042031a4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 388/445] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 96bd57251e848c1e3442f9203ec68980efa5e567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 389/445] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 45668b9d63c03e3c2ff070d20a838d9a6821ab20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 390/445] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 787b834f82f35839d8e883a8f9d11ff46d115e29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 391/445] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 63e4c4008a8d8e8da0e1ff441b8e23e4751866c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 392/445] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From a87b3ea038a26bcff1af5f39ec8e8b0963742662 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 393/445] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 1c2fafa6dac76ff6a7b37aaa6c36d78dbcdb6e55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 394/445] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From b34d5aa5c71446521221f52e8255480079c24cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 395/445] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From da4aa8d4d9ad1790221abb9d49c556c33eaf9d2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 396/445] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From a3300443e82bab9b29bc30d1ef8b7def029011a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 397/445] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 2e513e4b4ce44c95ccc30c3230fb895162c2664b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 398/445] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 7535b54012d46d238c781cd989e6e5eb1b8cbbb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 399/445] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 4d7372a30db3d9d80103357685d63c266f040860 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 400/445] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From a3a78d50b76eda679446bb77e5f0bbe050cdab3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 401/445] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 264e99529230325d308f0af3b2c634e91c8f1473 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 402/445] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From e95888b199cd5f2b8578db5a26b625595f1a15bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 403/445] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 51fb40b6d993ec10c8407bdc0dbbd94f60d5624b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 404/445] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 9993a77527b01aac4e0eae52536d5b12320bcd3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 405/445] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a79c10c61e195a966e32b39761f388f632491c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 406/445] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 9c2d0177dd8ff221ebb5bfc7f2b921055fb165ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 407/445] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 0b64cd1865e646903c213a8f7ad116b838ce7d28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 408/445] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 198a2da0bc72cdb83d6cf994b15ec19aaf132aa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 409/445] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 6c13744dee506e9223927bc90bba8ec01145f54c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 410/445] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From c360dee222d97bbe6d1eeb145ff89b502eef0b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 411/445] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e6063cb3739a5abacf92dd0a55373a8a50f92cd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 412/445] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 0d2f7fcdc273cdae3b508feb850607e799d9bd43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 413/445] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 5b927bfa5b8b655d56dc18a01102f9b25f767dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 414/445] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From ae73296ec978b0f503b491a60f8b2561891a6304 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 415/445] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 48b316c38c5e1de8d06281419abda90989ddf556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 416/445] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 930d04444e6def1495568cedb6d9dead08e97279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 417/445] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 8c21c52166718728616259e1ea4d5fb9cc01700c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 418/445] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From cf20e2599e6bb1a5622e097fe4e1ffa99f6b08f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 419/445] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 65b30daf7fdfd1dfa8bc1a1cba5324d3b5b39e73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 420/445] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 4209d5992fd15dc1bbd553dedf672c60b2402133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 421/445] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From da66f83f7a3076dc8ea4542c7b441ed6727a9211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 422/445] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From af9b373bfa470466b1ac12597ddaab079598d96c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 423/445] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From fa6d28f098ea5e34c54ebb60d516060968e0da9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 424/445] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 9caa0bb7777b807e68cdd6810c056014d7c23608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 425/445] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 029c62411e526c9496443450633dcbf8be7992bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 426/445] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f2553a8e8d2645a3d5aec894011050014331df96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 427/445] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From d34f93ad6f4baa8295fb75d5c3ad7a9065594c51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 428/445] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From d0c66de3955aeb80a1f07bd069c510a3dcfe4d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 429/445] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 9daf08515bd83982cf527c6ed84b0abec8d12805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 430/445] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 8b77cf4e536d626846dfddf24c5c5a9eb029e292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 431/445] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From bf621c85205f702c409b5c31bb27f655df65f569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 432/445] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 6890f95ba035469708c4395a3a6ab095b57293f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 433/445] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 09101975bf1ef25976e6c38c947bde44a42135fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 434/445] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index a98f9f4a651..fda805ea41e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From 4577a13d3b4a6e28ce5d9a833f81033e2765bf27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 435/445] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 33ac6813acbbf77176bb9e5533a75159c121e420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 436/445] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 837d931840f5b2b2f94b7f0f62461e00c370bd59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 437/445] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 485eb95827f344f1886698da9b134a00689db4c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 438/445] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 3a003dda71846e8c2c92bfd517d068b4f25e2bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 439/445] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From bc256c59d9190347201c58eee5950c1bb5cbdd61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 440/445] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From bb11ad7633b19971ab59ec158c0e0cafb51a49fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 441/445] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..47f34d3caaf 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 3c0a7ee178cb33ad5ece7ff4e68b70e7e6ff57a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 442/445] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 04d8676af63c922f4804cc6e6a7c9ec8c8ab74d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 443/445] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  3 +
 8 files changed, 3 insertions(+), 219 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index a95881156a4..8abdded05f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57b6b45de86..3fe02ef6e6e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -57,6 +57,9 @@ replaces="
  gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From 4bb4a0233b78be67f699e10bf96955e2afb77370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 444/445] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3fe02ef6e6e..2bdebeed521 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 196d70633607b34c77b48925813704c56c8486da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 445/445] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2bdebeed521..52b369e75b4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -244,6 +244,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 591486 bytes --]

From c969893d349d511880535e0624b0eb38424a6ef0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/466] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index fd1a20b0f64..ec4a77ab03f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 279bc816077cd97bf487f86c28e2c820e66a8e24 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/466] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 823f868d2c3314c70a679d8c538c21eccbc54029 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/466] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 4f7f8a19e70f911b5d3cf8175e572e3e8b01cc96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/466] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 104b134fd6ef8136174c3d73d443186abe847f7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/466] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05310963f11ec174f7e67b405e2a8028e0db290e Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/466] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index ec4a77ab03f..a95881156a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 0bf18ce661fa0547101ecd30559d27947232a5c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/466] libressl: remove package

---
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 6 files changed, 134 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 65413c6a2a0eea970ea529425bf4b4f1e884690a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/466] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 68f7f904c6cadf4f9d1e72f6c782eb983b9d51b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/466] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From f62c322c83413e51f062aebbb305d69c8baa6299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/466] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 352b4888b9fd2679d9d5e1e46a59d6fdeb13bb08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/466] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 47e59eb19b11bc33c8699c3d35badc7296bb0c74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/466] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From a452dad0b6f773389ff03450786a3f6e2dc1578b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/466] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From f42d669831d0eade77b9c0d7939fd31c3321e8f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/466] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 515bd6febf1e0679beeb3154a4e7771c411dd54a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/466] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From deb8231446a42ad6cd1d6813fd73274169057056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/466] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 2f05d14307f79b4f6d51d05e8062b7fd9660e780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/466] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From d17a16b253c558699910ad96fab2e5b6bb1a172e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/466] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 980573aa91be58f0fef61a2d28c64c7571618422 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/466] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 39a1a878bcb3d90cd678f9cfb4d83145cd73c802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/466] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From a23de5f86682f8b720d741a1465129f41d6c4b72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/466] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3d2fa7ad44e4aaee32223406d7a0299794507040 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/466] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 983be3d5510c59240a6f04382820e22d8dbc59a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/466] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0b6e0642355c7dd296acc0cffdd6ca020d2fba47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/466] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 231409218a7fb4b6f947f9b8af5325f593b1710c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/466] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 6a4059094a32b5de81dda25fc5c5a76ac3c39536 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/466] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From f5b5598ab0f3f6f90f04b7803f955b0e449a1b27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/466] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 0cf770b20f5b9b298ab71abfa3a176a7da82d00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/466] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 0fdcb8c330a9239f78fdc71a97a58f2acb1857db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/466] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 33132524fcaa846eb171d8ea4ecb962b8dc102e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/466] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 4381dc590ff596b7227eb8ca563e98096b3d643d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/466] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From cb9c78d7733c85bb5351718ab8fe5d636b304aab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/466] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0816e671096e49f29b6f34043a6c74b00546fc49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/466] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 1ba235e4ca93fae4ef9de1984114595c7ba9eb4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/466] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 2594000c4e1cbc70532bbdcc207b7e77dbb5de4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/466] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 110a88164caa1a0eb105e3c2b25c5fdcba2b17fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/466] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 1bdeca174bd7baaa705f9735eeeef89719743735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/466] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 4cb2f70dcde2b37aae84276b2d6c441a51f6b26d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/466] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 7200b8286fe12abd8fcaeb51e12b114b9a6a5e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/466] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 0501f331105efc7eb36166511a65c2b0855aa395 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/466] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d344973d08bb7033cd51c431fea2e8a27d1d692c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/466] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 36d5d65d164cfec6699432133270f3f9a1fab43a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/466] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 86da082fee4300556ca8cd68f3eb47e0d6940ba3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/466] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 93a6b06306bb7e2b58267bed9aea944a1e42fc94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/466] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 41bc7ea49b92ef553f622707d36d19b88ba18425 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/466] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From fffee115f8bd6b4b627023a3e57c69fe6ee2542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/466] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From e4a5f5bd78ec1d2995c6c5f39d4d8d46219504e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/466] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From aaeaed8f8ab5ef8c439d95aedc3a97afc10e9d89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/466] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 09155822c756942f6bc92b6ea1a50b2737507afd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/466] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From b6d36356ee9f146b71a4bdd459828b3d0384aac0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/466] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 0a13153885ab5ae7330395fc7422ef29e661a71e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/466] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From d29a2c86709f310e9c1dbd49bb4e7e7fbc898111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/466] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 6f163f7ff533f799538d8bf15a23c60c93372276 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/466] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 5acbbcebd0730f490eae2533d22930f0f51ac40a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/466] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 692419108149c475a9d759766a331bbf5d63f011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/466] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From c73cd3e1a07a7c6164051d4c52df7d2fca982c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/466] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 6fbd6ee51e967ea5d1dd7e72d01b6f74a96521d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/466] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 34c4266b272e21951f325f748c463b09694656f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/466] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From e4197685895a70e89c73ffab05665c4c69124a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/466] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 994b2847a0006f7e11aeb9d3d0367b26107312bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/466] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From d8da19f8138ce400ecbc647a10c5ce0b0411c485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/466] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 6aa476d18b136cfc618b658ae950d97d64cd7c61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/466] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 37c4591943c445affaa75ddb272e53d13e9f5eb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/466] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From da27d233215e6625cc471492abe1fe26aadb234a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/466] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 3f8adb53f2ece6be2a1ad749a7d5da3f25eb1ce7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/466] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 30093037c50f0d18acc9b0db962ab3749897fba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/466] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 6f613d3dc11fd3a42fb47e91e539cb73b52052aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/466] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From a628a3bb743d009ae1b760b0caa0b11472a5a195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/466] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 82873567d835a3be5000aa559c71a686c5aaf6e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/466] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b6f3a2b12928f86cf8c0d60a6ad6c1240d738e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/466] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 46214df97f22dcfcd7d9b070eb67119a01ea88b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/466] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From be85011b08fd9384d793c4e2e1b7cdb56b2a87f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/466] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From a62344322a203dd3dbcf42b30703cf0f9901b8cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/466] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 85a68bdb015b84b4cbbde6e1aab8bb6268fbf71c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/466] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From bb5da166382bae0dda6f06d1f4d937518b35c600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/466] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From a8d7817f9fa152fb5415b1b40d4df9097015ceb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/466] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a80f72e348329565c9412f6681836f435e64c68e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/466] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 19bc5b4d4cc510a80e3dd9a641100e82b33225d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/466] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 756d4d531a27bf6711b80294b177bfcaeaeb9cd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/466] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 04ffc028e84531ba8a797727be5beff6bbb480bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/466] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 2be963754b130b5c22d4ad4f990f5ea802c4a791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/466] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 39f0d875cbbc60a5cee81126421863dd9a665ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/466] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From da017cda4481ec7565a53e6e35f76b59ed41b37e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/466] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From cef57f48336bbbb15f027c0bafc2936d895e9c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/466] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From d8962707ec0cfd9b18eb5b53719118eba57282a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/466] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From a83d4a1efd32e9f46e84bb90fbb8e212cbc4bc35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/466] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 98ef0aff7c246f855949fe63797d4999f6c9da85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/466] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 1c2ea2ff814d364c23102e09a6ed5cb63c580aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/466] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 9139f495b26d34ae6565a80387126a2b1a51e4d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/466] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 4c19973e80804cee07ed4489a7345ec9ff8cbcd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/466] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 960ee3842e543fb4b1594628b395939d20b6ed2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/466] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 67e6442dc307727eaa0b85566f6538c2157e4f2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/466] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 7dca281395b9239312cdb44d754f72a07c7f5280 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/466] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 19df245cba6db79ca66fdec5f1fb1f699a61d792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/466] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 393ba8b9aa79a09905cc1cdc3c1b231a159fe200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/466] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 79de11d4ba1c609c3bd1955b272000f49add26c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/466] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From bafb4e65e2a0e2305da8293ffff640ee7a71773d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/466] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 2b11ba61319e9ca309d8d0ef0b8b4986aeda1842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/466] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 25f4adc08e4de4cb58ad92b8fd5e88c3ee6a0ecb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/466] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 407da25cd22e6d410fd4b39b30136dde80e57b01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/466] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 6d672bf234ce16846ad2786297bfc4c50d90dbf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/466] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 69e677efa40785ca55116e805f9445611215e522 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/466] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From d7110c0057496476f7e65189adff1f9acd376872 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/466] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 75145ced8bba4dc8aa014bb44d86d4d5ea747fa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/466] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ff43ce3cc945d3e1ffd490c0f29c981001d59c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/466] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 25530d6f406773c5270d94a96a6606871e976526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/466] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 07bc1a047efb2905a618327a73af4fd0d94e7845 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/466] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 19db6d4bbf1cb1432fcaec6382e8ffb307d0147a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/466] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 7d064fc398b1689af39db0654e9097c357424030 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/466] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8addcbbe2c78e8e49eb7c03cb3a4e50f6b7bcd6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/466] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 5be641a99e27cfc6f4c9ae1955e713e1d490e88c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/466] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 88e873b9cb48fb2c76a29a5db8dcaacdf13ecc93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/466] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 8734add85e1f75f1436985b0545380f32ded81c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/466] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From cf62af5387f4054554e4a99874b9dca9955301f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/466] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From d6eb0a4ba4708409c800d56fa7624918d808dde1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/466] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From efee32e9b46d567a483b93c79e2749739452af52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/466] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From fa47930a660acd9be4ed2feb7a247492129622c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/466] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 7e701f2c7ddb44de62be6bfa8402e3a2a817cddb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/466] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..91370cd65e6 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a61e337215edd3693e867bad5513697f20449023 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/466] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 5d49058cec10cc6b4d80f25e0b4c6e5124e1fbb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/466] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 32288e45e22bbae58bcc7681ab1e6a515a6c698e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/466] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 050b98beec02a0a328ba67d83ac14f1225f3e323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/466] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From f59fc92e1a5fbb0d1f1f763dc079e027bc4db4e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/466] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 37cb233ef3f5ab9f51316ef57cf914dce75e6e7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/466] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 12c5dda535b4f9b255c164ac9c1fddd4a25be621 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/466] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From ee764c26ae1ae68a02be4d8f0f1808a17560768e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/466] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 7e3bc635d795df9a8c3fd9f3ad137d2baf66af24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/466] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 128ed6152a6e5f42139e260d0bf34ac76e876d08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/466] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From a03f855dfcc827539bd8d60b7967a78f44ebf2c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/466] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4f0db09d2108d7c3b2ac1989f81fbcd4d153cca9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/466] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 454d449707d04341f4d15413d1e89dec564770b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/466] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From c70214e3d2d84e71b845426318a90aca8ca626be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/466] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 21435574ef903b1b08f4b97be86158e9159f168f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/466] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4421fb697e301a8581b415881d84c62ce1a8cc9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/466] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d3922445c6e6084b0632e2e8a6de5b59450d7db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/466] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 2164aeb05cf3f7bcbf2e8fa0d5fd60fc5b987d55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/466] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 077d53a090ff45f75afde8f90fc3c65c14262568 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/466] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 2b12a1f4e3f7a77125a339693da0158193e3e313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/466] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eb07c53e577d13400dede02e18e4b1edb9279be5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/466] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From cc5f340a7f465275aef455af16929857c9410876 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/466] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From a16c24b133e400054e5c1872fa989ffa3f478853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/466] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 0056f9920b386f276e449a7c24369c6a6c21f22c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/466] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7a3de9625e982f5327ce915f63fee908e4898893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/466] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 3de6227bec59b4a5c9ba4a6803d5bd21f0939cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/466] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From baa6d8d32ab94e3bbb54a2a4f3f131b9a6ed3889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/466] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8ad950a74469b48a933225f6aeac9976f96c88a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/466] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d5168bc49a2d555c2ed0640f7355eafd779d0ea2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/466] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From a6413caef25b113e628fa2da07abe7ed05fb715e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/466] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From cac30cdfc6fc9b7cdadef1c6d2586f9cded516ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/466] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 675dc21440c9d095b027a5e51188a842b5d6a696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/466] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 600749add539d273c0238053fe1cd401b71580fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/466] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 167920ce31b12d8fc7144c748eb3d87f08c9bd04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/466] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 22977ccd3e17fba7e865d09a8ebd27612d725fb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/466] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From e2ac55b5106a80ea4e416ae6aa21e020b171bb30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/466] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 26c9b3acde35bc1147e301c68887ef35dcbbcf04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/466] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2974f7059cae3f2d082bf35ff29c1b4c9eb04f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/466] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 5f85bb1d6e46000bcb34c3f2a858507bf4c9766c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/466] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7ebf3274af64183848b32812ecf1884820950526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/466] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From e93c66b3e27f35a09ec98f3531f28176c80d5b00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/466] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 29d405861d8e69b14947e0ceab326b35c12e14d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/466] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5e7ed4cac308d8020a74b2c4e1bde1c44905ed94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/466] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..e9c2be9ea18 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.17
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2aa8e4250467d7c8c767fd7e89581d6e639fa176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/466] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 94c0ff38aea3570781cc3acd291cda9e20d7e8a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/466] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e0e0fa61aa384c3435f898e084277ae169625efe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/466] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From fa35786716723919d531e74c30191a64da66484e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/466] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9aebdb1dd42561be6b8e734aac68b0b010f9fe7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/466] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From bf15dc4f1a26ab6d1171edb02ade4b7350aa1373 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 167/466] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 8bfdddbbdc6c1a9d8b5cbfc0037c05707eca9e95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/466] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 059f5418d78d43879adc17e4824315194fe0b783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/466] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 74139fef80f691f785079e000c1d4d6a3d605405 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/466] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From b44893a4ad9f46b93f3f9093b4c0ace16f22948b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/466] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From ed5cb37914c5765c011f7d996edad05de3a8d75c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/466] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 637a63005e1dc4fb2b06afc02e5375c24d00be7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/466] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 5ecef42bfed2d04c4b2544503a6346f79d17cd66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/466] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 369a6c2ed555810f5ea60988b876317db27053b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 175/466] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From d8ec10380f0d64feda3d8a46296686a95c98a349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 176/466] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 9d9d1842a23719322caf595d2cae435fe0c072b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/466] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 2a11feea6cf7133ad9f3461918379ee7120a6dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/466] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 3a2669174d7c08db52d429862010bbb84bcb7ab6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 179/466] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From ea7b0b796d7356d473297fb708fd95323ba599f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/466] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 7537f270d7177497848fc454d4c121fdc47bc153 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/466] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 3c631cd61af8cf9f915bd2d9971dd5a65521a409 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/466] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 71a9ac78825af22c64575abcec06a2d8ed9c7dd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 183/466] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 37d6df92f9dd461cf1ad702aadd9fe73cc797110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/466] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 19a3fbe764352f9f0cc185dccf1d8dcf4ec0ae9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/466] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From f3371c3ae746331f253fad5b2f478d39c7a83771 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/466] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 0da10053ddf4eabf562fd74ee23dc29baf0c5702 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/466] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d63df7bd4c1..ec3be2fdf55 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=2
+revision=3
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 377a698c8b24c6c272e6a3993e8ab2d59551a078 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/466] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 9a27ef996246829353416201db5382229bf63965 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/466] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 4272e65f8b9078abbfea0f84b135a8a1406e7bfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/466] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 630127d72f59d0a55c9234a5c911f09595c58f25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/466] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 53132b1252bc22360758e3c4a332dfe1e5bb8bea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 192/466] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 2d23b0b2c1ffcfa3fc569f6efdd41fa24adfa878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/466] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From b5bd8743d2b08e5a67ccfbdab1f7bf4a03784a13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/466] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c1e260da6b8368abdf8f5d0b5e4589513c1777b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/466] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From d88d575ed83a694626d656a96b44098ce19ad2e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/466] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8daf57c5d3b9b8cd00d99cd31fcc73ecf6f1bab4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/466] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From bfda233d0c528d4cbee6e248b7a3d6ac9b58ec3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/466] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 3327490d90ebb69f91a935f6973dc1c16d3acc66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/466] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 19058c4c659e6284e63a247b29f5220ceb0d5d20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/466] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From f2a0e3ab4177749719af342d23fb263b7154b9fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 201/466] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From ba2af35ad6fac04f9bff5e18547a6fc4e4c28900 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/466] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0485d933d1020c7a6ff1b9f5e646818a9b8e4ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/466] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6cefe86dc7ab90abb71a2f9c6a553ca1c4013856 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/466] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 62ef5b8d791dac6159d62fbf798f85b2cd5d1d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 205/466] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 6b9a787dde9a9f44c3bb9c4eeb10cca87626851b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/466] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From a17e5e36c5cb3c25b8864af3b3e6f676c5584fe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/466] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From f990125308d82b95170174e6e1931abb45abfabe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/466] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 701a9d735df6910e90990c4fa39a28b4a7b25601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/466] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 43ed20148af45eeca6f6600869d6b1424072b784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/466] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 45b6577f6181c8f3434a263c544cf3a622df2b05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/466] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 7d464fb44541a1453546ec6d3e9aeca80632541e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/466] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From bd893799b8540e9d40a3281a984a571088f604fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/466] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 9bee8e04f7fb80075b37884e81f7f42fb1035388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 214/466] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From da8ec5c325db4661ec293750215c79104ce8193d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/466] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From ffbdc7167ddddb51188bc0f4ce7434a8ca334954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/466] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 102e6f5acd554d9c8e058eb9229c63fde138c45c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/466] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 41fbc719ae46f59c18b0724ac7da6781ee4e1f09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 218/466] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 7c706b8755063cebd8ba83bbe3094c70df820ebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/466] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 442b193bfde396a76104ef43158f66dfda484f01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/466] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 499d804a32b59912442749115c015c72432dd283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/466] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From e74771d94412cf37984ea19673c5809d7588a94f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/466] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 56d5c8f3a532662127923b22a7be142c29993724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/466] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 81b1cbc012c2cb69da80ba02e65cf70c6c197d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/466] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From c607d2c51a8cc9d18dad4269b404b1e1b37782f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/466] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From d4806b19ed58be04511a7c35abb7f84637ed27ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/466] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 85ed258e1d29ee826e46f220fd9bceb9d10b571e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/466] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0275582caa515f9b5ceb1958bf95d4fb5dfa8631 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/466] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6581896755ae497bea537fdb708c26346dcd8cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/466] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cef829403538443780e3d574b4bc0c1c170179e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/466] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 5aa634ca0efdc427f3e21c7731c57828f99f10ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/466] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 10786968340b5e5a819244a0372f1a4b37f09809 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/466] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From af04020c1c612f87b99bf8d9c5db19968bbe3834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/466] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 029f3af67e3427d26641e58934b54cdfcc73f3ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/466] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From b8eb5d2765c6204d550a421f040abb75e1d7d59f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/466] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 534de15b26f7d906f681aff9c3a4b6052257e233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 236/466] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 8343898737e08dfb5046e884c37c611d4b1fc393 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 237/466] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 7bc4655c81ecde3251cd502ef1025f490ba24d53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/466] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From e5dc52a875a83ef43f167e8c05106169bf966f79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/466] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 9a63ca17c54ffb277bfd2b2b514ba1571212ef92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/466] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From bb327cead001f20b6c0a53bd3304e0d6213e5e4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/466] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 7c4170fe807b808a66735e75fb30130e50f6c6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/466] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 02e94ff7f62b6018ecf779cdee1f68a2af20ef5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 243/466] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 08b91ab1355a60d02a2ae7dacc8ba40fe7174414 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 244/466] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 542f730ce9ae0b811f76af8ad7e3997cf34d7a68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/466] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 723d8840d8253cc27a6a087d784dcfe02a30ba9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/466] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5c27023db11a38f12ba28f2589c3a56f96a91682 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 247/466] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 4585fc8b56caa8fd901a38feac4d263153c45523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/466] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 15caa86663e6d5ddc44f9f884102c7875f8c0196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/466] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 639dd6367d61f48852756cbf67ff4cd8a1262f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/466] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 16c7db7009dcd87a6c35c25eafe11c85dde76920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/466] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d13fff2aa109107b54720de974ac31a52e783068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/466] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 7968d3b8abe3c06f7dd7ec5d768bbe2048964fb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/466] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 2ba85c14364bbf36b9c176b558dd7ee0a5e93794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/466] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 399527c589ac89db61eca9d15f7c91e50d13ab26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 255/466] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 24a43a47210904f8060d14cfdcfef8ae34eafee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 256/466] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 9dc86d3c13cd22807c8d2b8d1f9dcabca7c7d208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/466] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 2ea317a37a82e1b9c33af37117c6ada0a43e954b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 258/466] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 56637852c0c4d67d558c094714da563208b0c106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 259/466] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 45cad0a03b1f060c52d0e81043cc6d99d764db2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/466] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From b39121c20442709231070527a77e0786863b2065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/466] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 10b4acb216f975f7aad4e5937e5ba62f84bad9bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 262/466] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 88616a17d0cc9de1654da82742cee6f944ada990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/466] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 60bdad4fa8da7024e032d7fcb7743a2e99114994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/466] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 66ddf1a4c65fd1ef423a876021ffa4104df3deec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 265/466] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 00a527ee3dd249642f3fbb1e5dd3889a4650b053 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 266/466] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 90389bf512a0cc61d21a5d3a612ffc1e2fb41791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/466] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 51ad0741df1c0b8551a093d00718396733ec46ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/466] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From bfa365d5ee778f9d5ecc24d5f46c484a1100ebb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/466] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 6bf507715949d0cb6a9e83fc0315bf2234f4b2e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/466] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 7f1ec03a659d53bc8bd2e88f09570da963b0248d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/466] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 6fec878ab07aea975e6712dba97e946dbe9535ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/466] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 6d21bd279ba965253da2a9844c3a8da8a8634adf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/466] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 9aca0bca8f1b79e51d53d7dfe308ab536a79fec3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/466] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 80d10ddd7a687e8b3065519301d923257150391d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/466] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fbf2beb8a5ae033f231d46cf447abe545d59d2ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/466] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 49ecfe6e02a3e163b1f675b0bbf78c1a2e600bd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/466] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From c5b2e791e4bea067d2295bd8994065f83516de3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/466] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d38f27cfaaabd619d0a4b55293d232ebc61ef850 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 279/466] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From d5a0573a8b7fcb1b5e2edaa19af65ee0203b3fc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/466] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 8e76b551613e6f2c513e82bb200fe3fce47b62ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/466] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 79e16e1b30ed39691fa1b5e19a9d86e2beba45ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/466] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From dd3c63c7237eb9d4315c8d4c85ee94f5d275b347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 283/466] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 17e83b4b40d5b1be7071fcfb6d2855d116e68d5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/466] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 9f52b2aa7967e21208c0bd83041bcb0d99d28c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/466] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 5e9237d4774954458c68e1f6db2ec57c6dbefab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/466] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From d1db491afd0ce1e8b1d856838564440665598989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/466] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 20f1264a9a2daf1f4787d323dbc8a239e01485ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/466] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d52e840b0171246a932c9ca51493c6de5dc144cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/466] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From e26b2379b9c4e4961940deded59733c09dc0764f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/466] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 6b9d30eca7aa3b79b80f6002dedccb4e0f3639eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 291/466] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 8765c2be8ee9d69e877be769c13bb4ee85e2d7b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 292/466] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From ebf3b62a3c2ce20391e09431ef86e54359b8614d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/466] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 8546f3d5afeb42d5329a6bd62367b16c2cd9b80d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 294/466] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 7fe366fe855b63146ddbe0531aa41b78e0197899 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 295/466] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From ec529ab1c336bf44226f3a56da9fe3e1b868ea3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/466] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 28b4d65d58626286901f51057d7289db31b64f1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/466] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6827277886e9a792fdf94ab7caaf687a6cb05344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/466] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From aac9606ef64dbe02124810982211d34187018b58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/466] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From dc8e3bd25383a2b989a489205d4b868444221333 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/466] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From cd5db6e9f74b360f86bd11daef7c58e3c80dd480 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/466] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From a2832b7f46ba3e7518bb8621f5b7cb165a7272a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/466] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 509270c638c808e37463abf0769ce9c812cecdd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 303/466] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 6df052c7f25d3f54d0e8e22e182e76144fe10896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/466] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 83217f63c239f658cd25ba20bc2557d7565bfaee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/466] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 355bfec8917e0224b87ff9ed95293f20f1f5bf20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/466] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 39b5ae541d84ff34a623072f1bdaddd35b03daff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/466] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 49329c9bac25053af2de62ab0e9e64979c5593fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/466] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 2e63b979a4cd0aff5ce6864d40a945f1e88a01e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/466] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 2223aedc0c6755b2f955f19f08e240000394b68d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/466] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 44ebede8e5666b57a31ca6b25f0015ea9b35d0d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/466] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 4d97d2c625902c82c890395ce107f9fe7161f0b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 312/466] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2564460466f4bd20c0aac6409a3703775e196e0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/466] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f365cd6a3626be794430eb463d19df459ab0a0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/466] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From bf3384eabbc8b64f447656c48b7685861589e370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/466] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From ff97018260b75fa1cbead53a550864afe2814920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 316/466] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 167fa026c3ec3545e5fc2a2e1ee59c42c76a7d11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/466] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 46b7baf05f5b66cc3035dc56bfad5589aa3d53c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/466] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 85630b04eb56073f28f56663550585e8953ee5bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/466] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From f0c0b2852e04c2d7471cba0eca01b232074d4f2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/466] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 9b78e2b702e35d807807f12623056c452210667e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/466] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 43bb87846375bcf23cc396b0c960e0246c1c1d0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/466] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4b5a054fd9f24b92053674457bc84ad243d4c6e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/466] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 6f41a8e12ea54bb76e02f46fa821d482c28a7146 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/466] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From aca10243536da68cc939aa5475c60aac466bd227 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 325/466] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 714b8ebbff0a4996954800ca009f5d4491ef1bee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/466] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 52b87b508342a97f9864df93883af94df5a84862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/466] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From e7ce01558de4642b6736a58898ad0f71b868d369 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 328/466] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3f5b1b869dc52525052d1c4900cd4b92eccc4b9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 329/466] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 278ffec485339904c50c5fdcc6b79b5d9972157f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/466] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 66ea4ee20fd07e40e800a2a53cd4a4ee85e94594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/466] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..3c77879ff90 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.1
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 7c8b39e7fdb75ccab7697dd22c8a3dd240cc9904 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/466] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From e9b21d287674caa93ceaf10e1d405ebddef4f8df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/466] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 60da1242ae4cd09dbeb880f6fb8c663ed98b8b51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/466] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From a55fb776b93232f03933a53624a77e25832c9f65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/466] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 8c72605ac304ce62a67b820a7a62ed23d3439ef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/466] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 607fd2d76cc484c8c63df1466f57395b7a2680e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 337/466] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From a2d15afcf92a76cd4b9fcb4b5ea6e8117f32cd72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/466] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 2a52855974ff54a3b080fbbcfbf6e89bca128aab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/466] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From d83f99b1e5840c8ebb3c73d2b147d57ecb8da2b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/466] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 7147c9dfe2d818ad87740f8e32953d8cc6da2103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/466] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From bba13555139665c45be633ffe06d44a359917075 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/466] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c8b09e959c807fde60219a49339a9786af7cf510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/466] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 0fe207ea342ca910d1d21f1bc74b8b3bb648d7a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/466] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 6e357501e143de9229bfca3c3e0467238e77bd82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/466] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 84f2cc220b1ffa33b5d3cc6bcfa1b92143e1e276 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 346/466] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 09d471a432948fb3b4853dd43fa7c2660f8f4fd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/466] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 37477792fa720f2b8ed107498653bc5741a2e35d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/466] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From bfe5478f262580fd58355e48af83872a67306ddf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/466] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 501f0a567788d1582e1c994519548f52e8eed710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 350/466] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From df3d824a23b7449491b214f5eb73336a0159ab9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/466] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 0d1e684f750832449b4c77a5e4c1cc759e0b380e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/466] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From cb061b820a822e4f5462755150d4b3ae78ee81bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 353/466] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 006120e81e1dc6bef7571bee696f220d3f5dfef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 354/466] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 253c43f67ebcf0c8243e2f5411790c32e40a7ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 355/466] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 8ad42511392ac651ee212e992a68bfb3411c4d3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 356/466] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 0dce8b2601057f9e6ebe2434277f4134e7549903 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/466] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e9fa794b465add084dcf00d3c055001ca46436a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/466] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From bc2c8e8915de4b1bf03f7b9e2a30a1af0e24ebe0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/466] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 5ea42513e625a81156ad68c80a2f7dccf83cb0f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/466] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From a0d831b84faf787e5919b9d9f49c5ac9d3b98b81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/466] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 528278580dd18a8fc8c4a075e4d337085e46ca56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/466] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From da67ecc2d8111bb1e394272e2cd79320a23ab15e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/466] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 98dd801289b42bd4433acae6ce30f0426f49c7c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 866ae68a32392d8b86731567e773f8a8d87c5f25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/466] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From fca26a20570d8fdce127f0c9c8b6109c4176dd18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/466] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 1dd4836b7fd14753c5ee34fe3c9a3c9f7aeac691 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/466] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 8061dd4e995497e08598a42b82673d236324e211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/466] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 48a7d61b487b8c087b03a680907cb2f55d4d9127 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/466] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 008bd7a6a0b64e303e049282a91b1e7b049ff434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/466] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From db3de2a206c0eab5e828be4bfb7ff1b3bf2ab8c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/466] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From c75c49a8415d1caea0f4e368c9e8b1dc406401b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/466] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 792a72b76c2e60f28193a307e6e783ca6622eda1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/466] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 0eb0f14456b5d8b60c3cb47031bad9fc31426bec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/466] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 51338f014079f77e07a70e10ab4b8bbefc1d7e49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 375/466] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 252b141e5effd363b25f6b3ca684ef256ac72286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 376/466] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 791744cadab0a0d203eaa4fc1154b95d7ba4bea1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 377/466] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 402876e8fdfaa1a5b7da6d9dca49a30ae2dbda3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 378/466] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 61a2119fd18a4df7ca1150f66aba6acf7c96d188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 379/466] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 97b84ffc2b30277d2b534296c7903240a8f0a8ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 380/466] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 9b903d228ee8901784ebf878a18cd6eb00d3308e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 381/466] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 23f9be83d51f4620f5b3e5d7bf1fb13069cce4f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 382/466] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 1b5fde489f117e3df0d92abb14955d2bc7be693b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 383/466] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b5fe7cec09680f2bfb34056f46a6f7b066b2994d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 384/466] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 4cd8d0a3f46d4bb485b4cb08a557d8c3814477c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 385/466] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From b923cb3443d8a3992bac684550800aebcc8ef010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 386/466] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 027d1b645a0de95279b47a619a2c56539c731b71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 387/466] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 3eaa1d83549a8d2921c8542d9efa31463a1789ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 388/466] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 80c58b05c2a4f866bd5dac75a8b553c01ca31ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 389/466] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From fbb2ebe841b503f993ac9c59dbbff3cabb707b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 390/466] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From a169e28cf898eb0261c14e1b270ea122155fc27a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 391/466] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 658ae80d3834f310234418cb2f1f1be282f06edc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 392/466] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 657d892c5c8e3228f8ddbce4480e552e2fe4ebc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 393/466] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From f268bcad4ff0d5cdde8b4fb313477ccb1e105f1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 394/466] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From c4d7ae4025d47064e386ff58073a6830048f1c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 395/466] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 3b373c4e0a44b2b0b7c7d5527ab5ef4e74f4af63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 396/466] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 12da11522622e5f438c188745354b4540b190060 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 397/466] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From b7011ed85353d30d3cba33926d0a1687d6ee3312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 398/466] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From ad06adecda64935836cff12752b4e6eb47e72c4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 399/466] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From adf72e053faae731aac867d47501e097d85e645c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 400/466] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 612cde8b1759ff4b20cd5c9bd5cb18ced0a9037a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 401/466] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 1b519636056d320b3cf37325a264d8c394fe64b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 402/466] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f9c617462e79ed4b266533cd23d31f9d578f0a90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 403/466] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b9b005e3eb52eafd06a8af2ca62670fb6965f848 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 404/466] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 3b9bc69111a07536cf7818a1f76de1d00ab4443e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 405/466] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1173e566d8f7acec4671e0ad796e65566b8a3176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 406/466] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 79661e8ce2e4e2d439887e1bdbca82697de8ea4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 407/466] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 8e8787130c56d080f95e2c4a3a5e41264043679e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 408/466] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 03c62c77f5099539fe6ba664454cfc4fa0afdf09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 409/466] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From b414aa1829aebfc8f0ab74fe0493481af1817aa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 410/466] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 0ac88a770fe29efa6f390221cbde007479fc334c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 411/466] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From c4bfe24d36d646ce857e0a88285ebf3f8f755711 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 412/466] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 4734f0d6aaf50769ca037a7e9b785acb830273d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 413/466] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From ccc089f778075ae313fb71aeb01d5630d8748158 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 414/466] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 979c3e92ab3f0c5eac7b2aca0854a56fc4b5c1e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 415/466] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From ab0aca584927f9cde917dcae38f870f2f432417e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 416/466] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From a27580b3b5e832a545f225cb25d00f56dcc93d93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 417/466] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 5a663010347d57de06e00084595c94356da72f7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 418/466] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 969fde6b113ca6526d87115d7ed48c7ef7bfe055 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 419/466] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 1a7a51d980f3b5e77ca86a3efebc9efac4afdd2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 420/466] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 91688b81c9a7fb31d3f91e5355e851fbb7f176ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 421/466] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 7a7c8e9ac1235ede1793b71b515776bab66b839c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 422/466] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 087537e4b58e7b4f2f78a6c5bc46665639f74f52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 423/466] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 776f19b248002b6816a5160faa7e9d28a8c0c29b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 424/466] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 085509982f912de3c889bf05e2ebe7d83f0ed4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 425/466] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From d52609c8a054b2f6e8afa8d564c47ad2f9e9167d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 426/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 3d4b658275ae07c34e21a1da4b78fd1b71e23ba1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 427/466] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 57a31e3efcabe094c8916d3cb14e88b40f1c6924 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 428/466] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From e2677f5cb148e9f9fdde55020702a96f53048cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 429/466] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 7ae65c73270d410b4cac30af50b278e28f85c1a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 430/466] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 70541c837ab59793f75bc569e946841abcd1f6b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 431/466] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From ea33497affacbd4919982a5497a0292f13a57039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 432/466] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 05f8b9018660db69be09fbb527d48e95269fe7ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 433/466] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 065e291b29eb90ed3cf463fd869a95f732f2cf52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 434/466] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 5e868187f3aa46fdc0e2bf04396952d2a390599a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 435/466] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 9314370254e66e65945b74e8dc0cad940e846aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 436/466] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From ba730629bf9bbbc0346126cf74b71eb65fc09710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 437/466] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 51a113ad13d7fbe7ebb52201072f4d882ae16c18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 438/466] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 4b2d0c4b66b3a5d7a2e3203a151bba033a59eb73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 439/466] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From bbeacdd46f7d960bf36bc1965c916e6620db27e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 440/466] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 7192697052a505d53024d59eb1129e79434e7c60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 441/466] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 77e7904a0d54fd64d5f677229e2f0551b5e11f8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 442/466] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 24c809758c774a36bce12eee3ab57200c2f4b273 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 443/466] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 5f4ac2c63de8aa1a9c2249c362911e111bdfbb63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 444/466] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 72cbdecd7e2e983f03b4d813d381aa0143706cbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 445/466] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From ae05039b411042d302b7eed7ef74f9b291be1fd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 446/466] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 9a24710d8155dde045f133f37c96588fb5a75554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 447/466] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From fc783508534c5dffb4b39f7b242c919a04daf760 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 448/466] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 8ba537155d51e809d927d69ffc705fe0702ec796 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 449/466] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 122286d9886d88dbec5a6a3da91fec70bcec73db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 450/466] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 9d9874dc8310df2f04ff8687800c5d99792b8e91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 451/466] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 1c12c20c860acdcbcf34dacc02d3e46181fd666c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 452/466] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5f5c27be03a4abeba5383f2d13ff95f461309aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 453/466] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 56cfde498b19c79d57fa21786a6df815b41e7c0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 454/466] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 544f80c8658..add017175d1 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 752d5b549c85727e95a5ccb7f166acf7b1da2075 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 455/466] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index ec3be2fdf55..d214df24872 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From e7edf584cc3b6fe887a42e0f7ccd08ee3cfbe582 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 456/466] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2748a7d25e8017fa84d29ffcf825e59d77f6e1fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 457/466] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From fc0aa6ffc0f79556bfd8c4439ae931cf3aa18458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 458/466] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 65c1e6ba113b9d433acaf41870f445acf8611b4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 459/466] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 6a374ba4f4b05d550084a4009565dba11fea7b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 460/466] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From a7b73353fb2572f7265eacacb180647182f043f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 461/466] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From e83ebcecfd49e3d34cfba34629c90962e11f4aab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 462/466] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From aadef0e253e051b4d1dc9afbcfad666c6486d8f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 463/466] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 61531704dedc8ead98e6a0463792b54e35327df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 464/466] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  3 +
 8 files changed, 3 insertions(+), 219 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index a95881156a4..8abdded05f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03851aff17e..2692a8d54e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -58,6 +58,9 @@ replaces="
  gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From 7686ace3ece1bfc500ce5eb19a53083f4db6e589 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 465/466] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2692a8d54e6..770c03b8ac7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 614f62088291090171b396780afa86d547030d24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 466/466] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 770c03b8ac7..54d8d72745e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -249,6 +249,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-782927017

Comment:
Ready to review and all revbumps that are needed for x86_64 are at least in place (mainly some arm only stuff doesn't have a commit in here yet).

Depends on #28911 #28732 #28948

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 591977 bytes --]

From c969893d349d511880535e0624b0eb38424a6ef0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/466] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index fd1a20b0f64..ec4a77ab03f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 279bc816077cd97bf487f86c28e2c820e66a8e24 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/466] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 823f868d2c3314c70a679d8c538c21eccbc54029 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/466] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 4f7f8a19e70f911b5d3cf8175e572e3e8b01cc96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/466] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 104b134fd6ef8136174c3d73d443186abe847f7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/466] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05310963f11ec174f7e67b405e2a8028e0db290e Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/466] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index ec4a77ab03f..a95881156a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 9f71889d5aba8f28d518923b05133f285db5f434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/466] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index a95881156a4..8ca98b799eb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,8 +1756,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 30af45a25b1d48e682e3caaf7d68442f09a19fa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/466] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 23970d064ba87711234ee3a61edcdd90b4b83e09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/466] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 9e7e4b0f1bf5e41d3a836660cb27199f53176a2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/466] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 26b13d5733161b99dcad7a7b28164c81a4060544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/466] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 172064250ed43a226ec3a06c36297380d44f3118 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/466] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From ea33991c169319831828c448df03cf407250f5e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/466] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From b386f948be461bb30008dbad074d652aeb8ee1f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/466] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From ceb5eaa021e1e3e3d50c22c8cc596b4a744c62b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/466] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 4e1f68324da8f318869f5b3b3657c6b0f45be241 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/466] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 279098123268e1ac5ec53e522231d23484c2d7a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/466] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 5ad12acc797b4cda55c52173e095e4bfb2d620b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/466] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b2f479496d3a318f431a50eb12ff6e0f02e38dea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/466] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From e113329a6454a04ea87c331f5dc5974ec8b6ebab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/466] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From a5d3a1323938b44243ac0d5ad9c00554a99642cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/466] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f98615b6db48175125eebd2a94d8e297cefb5129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/466] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 901bae4d5bc5f7e676125e825b5b4b4888ecfa84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/466] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 136b032ae3e3536b5330c0438ab26d45acd5e937 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/466] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From d309d7b739f70f983af1a66a1290f854562dd8dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/466] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 4f3b04641023ee633c6a5a201eb8ac97dd85daa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/466] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From dc58fb62fbbddc9a6b4c05a8df7101e67b22c027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/466] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 0795558c58147088cf2effdebf319d709923958a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/466] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 01d4a5aa2e1b208fc6b098524cbed131af25201f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/466] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 8f410c377babe9ce8b2bb2905105e5cf54bd9bca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/466] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From eb49e8e7412b7f7fc0cf52167716afe2b76630e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/466] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From cfb7ece05d29ce4861912fc535a5d83b1451c1ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/466] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f4a4d21a323a21174b16ab8baa077ca0d54a8137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/466] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 1dc0ed552121f75a8332d3685613a707b65f03fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/466] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From f6b3b88bd96a697bcad084df74987523f748650a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/466] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From b929f34e2fdfe7cbf5f26ba497152532ac9586c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/466] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From c5e3118fe4d9c5bbe91320d6669b4c38c2a569c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/466] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From c8a776af4256b0e66335f3b68fa7e94f3ad5816f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/466] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 71c0adb273cccfaa08f4feedec6701aca1ea8ac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/466] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 19562989ecd58fb9927219254647c8e3978465ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/466] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 358a86d315a15215b258bf865b7111858d818eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/466] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From ed62e97abffa84d461a14ce4ea3b7fa03b151662 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/466] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 525b6a18a1a6d0597f2007d57fdf8d73e80bc5e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/466] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 4c9791d6b2d469b980e0c0111a961fd9fba568b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/466] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 30d82d77735dc5d89591d6c64dec9e20c410b66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/466] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 004faa3c043c88a8c711ad877a6c0863b7b17b7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/466] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 17a5acea8fd4311d837683f5e26bf4f18b82c9b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/466] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 18c18cd09fa137d42d4d12893ec5d275acd9cce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/466] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From ba7fbcc30536e81650583431ea05f20caef75b7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/466] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 526f3481b1316c8261f1711a8388ec8b37fed387 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/466] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 7e3acba0a8725e642e277bd2257f7f5d03f89570 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/466] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From ed70e9ab871112b2f797f4a2c95d8e41d1834169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/466] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 749dc6754eb800625bec75618fab7d4d2d66ead9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/466] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 573e9b17127ffe4087be1a8bb10902520591b29d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/466] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 150c89918f16407667c6eaa4dedfa92647756395 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/466] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 6971ccb520af78b7ea9bddd30efa5a86662d133e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/466] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From b081d04492e57cff4e7ef8e6350c280d8eb4b6fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/466] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2cad17867b7dba5477d51c80bb7760daae96b05e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/466] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 7ab49ef040fc738c5bff1812a354ce262a0ac2de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/466] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 88d209088ed1053ba29d5cad5cf2741f122fa330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/466] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 384c0b44387bc5b842177a56b4a63118f8064ecf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/466] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 341f71379dd67198418985a4c228b0e6e62f2c1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/466] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 23e93f965022cdbadb7affe8d29847d06f4dd2f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/466] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 24bf25fcf73f48f2163714e4fa53121e26b25b1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/466] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From d2d357c65603461fc0269b50f3fa450e51462e84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/466] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 28037287fa467fbe7d5fd966bef201b8f18d9513 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/466] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 1c3e35610f81cb415fc0dfa7498bff44b17aab23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/466] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 98b307ab60598e97849f30e820b962eb711c9ad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/466] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 233cccaa9b40c5253a9f97431edcb84a605e53e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/466] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 907bb971fe25b509ad1a9ef885460c1bb1f53475 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/466] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 17db6863e8ff3d9c99580e75767657bff5e4b902 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/466] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 4a786e1606373a48094df7808e0b9c1384eaea36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/466] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 0818916feaf6587efcda0cacd0637af413c4e3b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/466] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 9c594388f41b1c5dc6668cc84f7d4cb6765f06c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/466] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 297e715ba24ce348a1a180f1a7a2059ef7f6f522 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/466] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 0e8c86248aad028bd0275885ba6f028266856815 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/466] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a6a3546c140a671b594c2f70d22acc54df79afac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/466] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From bb32202f00430098fa2287fe70b6a7ef61e52139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/466] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 416f380349e847f884aa3ebc741a4b2ea7a43121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/466] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 0e7593cea17ff9d816925660a2ad0edf4f11737f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/466] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From e0fe9a1793b44ad59a41d5ea8f925960c845875c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/466] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 8b630937e23f4172e3179a411358febe14494858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/466] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 8115b4cd300b358a3a768cf1688d4209a9feda83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/466] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b385c60c8b096b43b6f2c9d9cd211464b02c0ff9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/466] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From da34a47763059cba410a217f09c5ff359b4c8de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/466] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 03b2a50fb97f3ff9d90044418fcbe0999fbf875d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/466] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 885b022467bbc0ebb36e7f1accaf92bd3710c8a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/466] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 375bdc4c382a221001a7b6c5be7df2523aab9fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/466] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f8176f5be3ce720d3e71d4d81be477b6e4b74ace Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/466] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 511f761d70f53dac9ef7098cbeb95444c89f1dc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/466] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 85569d517f4fd05495497d27d649c0fa67ab6942 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/466] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From a0f7ffe356386a461fda180c5b99a22e433e6f20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/466] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3f6a32bb9cbe69cf032f3602fdd359f894d12372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/466] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 9297b24db38d27de8e4bd1974ebebb1d65c68f58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/466] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From cd5db65c2668b0d6eb82497c0797c5b94c47bf6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/466] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 527ac493012c5084323c728f285d31edd0423085 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/466] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From cb55a444dc96a05b0154e411d6bee8820782d3d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/466] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From f29ebf9db372381f0f2e4e6669459b9eec7fdf84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/466] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 05348a0012b332be60fa402c529ef83e67629300 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/466] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7afa83d82e55950507df89a4ca2762c420c9645d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/466] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From e3e6373f1fe550cbbb1350561713556364b10bf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/466] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 7e1316885b611d2943f8fff415356386b972d2b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/466] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 456abfbb4a812ab363bf3da535def1a9bb9481d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/466] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 834e3efebbbee4b01d65817e9b890589c32c0b1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/466] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c07e80fe706d330df4426286e106fbb72a249509 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/466] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 8537d0c4213f38fce7a224375b3069527abe1330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/466] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 156d40fa797cddd6952e9bafa38caf9db8cf0071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/466] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From b8d23d0eb47b295762a9b4f998ff527266c18d22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/466] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From d758c42582b8db7987dbefa7428a83706d86ae81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/466] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ab0a998a21b201584b48ce802203c21b9b6d2649 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/466] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 788bba80b7245f9c46d62b329344d6e103c685ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/466] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From df8aa52c31c0dd1f418883d200f41bb5b0803738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/466] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 996b3a47db85c1d4d8a352495e9d1cbf01dd2251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/466] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 003c83a66b9632b32e32e1eb26de2085a66f4b79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/466] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From aab93778b185c1cc3bd135e57f73d02dceea55a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/466] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 04562199ddc4a69f3b46c86dc16ea78383b31aa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/466] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 58f3a60f912174e6a2280ee18c812e4eacb214ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/466] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From d199aa9bf29fa72d2dd771b335976bb774963b61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/466] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..91370cd65e6 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 14d93d67aa6ac844add82f7bda827ae1bbe6d9a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/466] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 9bf8a70d67ba0966bb81229c9feac21ca515b3c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/466] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 109355bc99c3cce85c10e1ee4eca645c7201922b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/466] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f03cdd29b00206021b22f03efa11449d7e7dce47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/466] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 0bcaa256945240a64450d6d8567538257cc7b7cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/466] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From e778791a44de0f39b903ec04e55164b964128af0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/466] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From ed22da8f2e9d4021e7cb52a670ec8d31ddbe27a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/466] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From d2d875ff317176112218d569dbbab6a98bc62928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/466] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From fb6da81a1d31b4def80d6a4383d064e1b7cb5bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/466] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f2b6054766cca9f041d2ed5000af5dfae7f96a0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/466] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 56c328da11faa5d7ce910595f250257ff86e6415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/466] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 275db466165236381d98df0d4f4ebe014d403785 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/466] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 0ded016d4062b97eb06ce64a8662d357e8bd1146 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/466] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a2414016d737253a57cce00ffefcfa2cb9a33a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/466] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From ae223f4ae88419a157873f4ded68b1d9c349f482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/466] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3696ffef39c8ffb84f40a4d844a80e217b708c47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/466] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6589b3a79b7b30425e0c102ddf1628234da5382f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/466] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 4c1a5cb0bec9b738fc3475903dc752b8fe068ffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/466] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From d18be418c740ca080e70b88ae51cd48cbff2d995 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/466] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 55bbcd16f1d5c4f9c65561837896088b95cdca5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/466] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d0ba454a2e61cc64d6d2e7ca2d85eb20bdc71fbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/466] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 2b829de2c82978e5b2789b84bd539ba6bdf0d86f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/466] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 899998cb27e9a1eb5056d38c32b7de43d2238eaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/466] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 0155310d50a7b2d679cf3c09b88097c3b7a27fd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/466] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cf6f6c04f0e2531a88b04f809bfaeb320cb45496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/466] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 97cdf09db072814d7ad0a020cb76115aacbdaef8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/466] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 2ef7d2c885e78bbd9c95621a1a8fdd821b313e3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/466] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d49001561010ef88c1f32a415c1189d5cc7f16a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/466] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 77c942d554949d36eaf436785cb96cc8f628ee9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/466] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From b14e70461a1fd6317105397de00899156567d7c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/466] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From a2f1fa12f4a403b7a35a99eacd125b3d0de4950e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/466] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 80acedfc67a30be19b2f708180a7340e92079584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/466] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From deb9e12a91e652dcb59ef53f10af8b043da12cc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/466] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dd60d0512dcb3812f57180c2a8172e331b34f8dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/466] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 6ad278870eb4e50f98ca3bfd488f36cc632d4b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/466] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 9a96e868b43073b02321b6819b6042beaab8a8e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/466] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 987b6dbfb8cf47d6c998c0b4f34a5755177fc261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/466] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 49b07b0ac22f1813576ad6b2da700e4ec876c94e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/466] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From c3a6f1ea07291539fe3e701471196e68a5e415e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/466] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 52f15a63bd7f9b72dd24cf2d1eb0f6aaaeb443f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/466] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 9efb01043ad8d71271a6e7218dcc6c8f68eb81ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/466] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From afef387d277da5b04d8ce55882986c6b9f9bf72b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/466] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From de5ae72f4b0d9a12f16e2e6db85650ab6e678de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/466] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..e9c2be9ea18 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.17
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 698f75461c56af256dc2ed3ee2320ae6ea565821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/466] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 32ec35b3709b3b2d867ba296ee754b2454ce3b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/466] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 884965778b91afb5ec1a2ce20303c7aa4023cc66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/466] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 88023e402929265f94ff30c1859f12f1e93d6b60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/466] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 07b003f41783c13995de72134a3d1a212b391255 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/466] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9ae6791cb0875346089a51643a8fb73e8307674d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 167/466] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 78ebb1d618dc12ae9191fdf72e07c84312749985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/466] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 0604c35eef4a0652137e466e2b04386bc7528eab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/466] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 1384006e42e07724639f80feeb68f15e5d116cd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/466] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 487e216ee7c570d35549c19ae7f67c3a4166dd15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/466] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From c114825881d1ae2e429f1e8ca2008d308f28f61d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/466] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 69443f4498656ad0c73b3f3550c6b8fb578aa764 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/466] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 4fb78c2d59dbd7792f918ab944e9b3d6a70b4308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/466] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 36faefe01ba623addc6c561dbbadc2bfc9c81fb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 175/466] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From b88d13cacd925875d35fd6d88271867424b0ab08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 176/466] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 56a24dce80c76e24e5a6aebef88511453d8387ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/466] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From c7efb99bbb4123880faef151e91f24a8c68a4015 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/466] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f8068dd23029d48e6ec6284dadc43a8c27801cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 179/466] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From c5b567c7a7546814805240391ace3165ba60bdad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/466] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From c660079b29a0b15cab61012686b7f6de5dbbb9ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/466] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From dd19eaed5281d7337f597e266998f5c2d9841713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/466] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 097baa2a428049fa32f18d8005997cd585a3184c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 183/466] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From fa33376fe9823cd0699b4661839c1a58f0d2e7de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/466] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 9aff560a5cfb374d3e9cb6ac2801b80d7cf2db28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/466] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From bdd757ac2dfbf9bd91cddd1a8e7edd62eda31469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/466] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 09c8cfeb1326a99b46befff70127bc1672684308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/466] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d63df7bd4c1..ec3be2fdf55 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=2
+revision=3
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From d7711b023faecb9b49ef2e48dfe16b6cb611ea1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/466] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From e537ae00291b66736c2e4540ad2154ff38cbd0fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/466] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 1a0802674e953f87ab65b67087601ae0ce2cdcea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/466] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From d036cc94d79a2c898d08c3e359b504867bbbb220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/466] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 49dd684db14f0d7ad3348d42d531d2e8f2873c1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 192/466] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 074120f1b49f139644f2912c34818635ce88b811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/466] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 1ee4322ae5e19cdf74d1fe7d38fa75d959825c2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/466] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2526262f1d2c92ef3c071ecad838f918adb389e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/466] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From ec3c703a1c33d5d8c943cac4364e5876f72ab674 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/466] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 0041ba67366073f4df79e5bd9e5cabfc347865be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/466] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 3a57ac6716bc0cd93ff052b3fd376bfae876be61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/466] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 4ceb1b90cdcc46ac3d2207daecf7a94f906f1f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/466] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 27b492fb6a9581ad864d572248f0ff7a1226daa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/466] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From f66d2107f16638c76dc4ef553a69e8652f5539f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 201/466] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 94cfcd00c696c1ddff7801df10c4b37b028afc11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/466] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1fde908847e0339f0eca7f19cdef62ce7e34f647 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/466] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2c0e73528fa00400bbbfcd56479aff9355a40a7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/466] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From a0fb0f968570626fa1de1a300afbb768c8718f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 205/466] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From f9ffc641e8d0ae52bad622e9c846d5d7c382f774 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/466] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 4a049eba1fb25fc09090d5307054fbd035bd8003 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/466] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From dbc00539e9062bc7f47d2931ec478b7506626c37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/466] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 4394fa037d778f02c237e75b9acf7140d20bf6d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/466] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 126f5db2e4647db5a87750324d286a33acecb592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/466] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 793b3bf463864ae21b860b7cba9e53cd3e5ec864 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/466] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 060227a96ce1d08ec080fdd4e1d7d6e26bdbe7e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/466] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From fd764263e41ae2256bc387b391d69f4e419b16d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/466] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 297a4f7c8ebaf955d4b5bcf523afa3f4a8692b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 214/466] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From a000c0368f7fdc8dbe2a21358f08971678c62233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/466] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 53cd9518979a6f73dd6a229863ce5378bde5721f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/466] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 01b217bcdb8361ff5b3cc559be8a5ca5a363703e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/466] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 2772cc916d54e04c11c78ff2c93021ac768781c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 218/466] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 27dc50bdc2c76cf85b3fe59dbe274e666a91a4ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/466] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From d75123edca6eaeba013a7277844a8b863820505b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/466] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 0b4e82506278be3dd5feb299f3a05a3835eab395 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/466] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From e685d6e8dcc2829a7332c539e0349bfe03e13348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/466] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 5d13188a932a6a6f6098a8b5bf9dd9c22623c747 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/466] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 2c7407639b9bba145e6844e55526298d1ff50111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/466] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From dec6f4b482b4491e54fc6927f8b058473334edad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/466] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 08c865397bd2dd1917561663bd1a45e01676bde9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/466] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 73e8565f9b91a9e21bdd9e4dfe183bf13975990e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/466] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 8cd68fdd10c9dd1798dd3de8d71e515a3fa331f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/466] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c1dcb22e7c880b05dc2c5bc49eab4a64296b40ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/466] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fa08f2e331c7917411b90c45243cc876f5fb121f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/466] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 33eacc51b88dd672621c5b66d4ed4d2aafa0ed66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/466] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From bb8d0a166aaf78338b0f2113f8ebc6070dead18b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/466] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From c755ad879a7bb42277b697eb0545148d3fcd2f0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/466] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 1c43cc954dfa0618a2d47b24122715c9cf92220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/466] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 1d7eb35a194cae331553a6596a93e3cd982e610f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/466] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From b67f593739824d601ce053d655b41dc791573a56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 236/466] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From c66c677adfb6d94b752bf10e647d08c8be1ec57e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 237/466] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 1a8ab895286b6be902bb5b9b049232e89eda26bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/466] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From bfa1de29dbb06aabb823aa1afec49963a644e6d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/466] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 54ff47f957ecb0880f3cb3f75df5fd7af6f38c7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/466] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 6b5fb77bd1d8463581b03333e8656584333048a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/466] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 6560d073f89709a4f0497fc157648fa910e014b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/466] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From e9ae86ba2ab9283e8be2247a90d55fa1de59f513 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 243/466] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 11942c0c9daad28a168341e908e898818b985688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 244/466] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From a44f16d183f8f40bee8a45b9d264348a08013f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/466] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8c8b322eda6733251946d5203118e32c4b52aac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/466] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 433962b924045d9efa1ec25d055ccb0b3aca13ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 247/466] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 54c4ab8d85599f8f1c3c4573485c0381b8028c21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/466] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 3b2cc1834164d184fa0ffb21c89c499478114905 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/466] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 5de7ddbefd3e79cc8f22cb89c0fa75909ac12e8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/466] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 81c33d782d6e5203ac253a8f42af8f54f675e9ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/466] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 34ed3550c87a756ddded6836a64ab0c65e617f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/466] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From fbdf7f4e5d86662b91962f74a9fb3620724629a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/466] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 8e7eb377130724cb9e516342bd60c8b73e668093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/466] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 8f71b1492c1c763cb36583e56f9fdde6e929c6e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 255/466] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 8ca7eff7f0cd7e1511a9e531a4e83f00190c5632 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 256/466] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 809edbfc7085d1b13267a91f19656ab3ccbf7ee2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/466] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 1d623344ede60d9e8452e313f9caaa555c827efe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 258/466] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 4253b5258e52a5aab1ea10b1ac7004b49cf98780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 259/466] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 6a88de8552e6d6795f9b5f7a883845f1451ae12c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/466] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 978743409a1f3155edd7c8981a18a30820663720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/466] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 7dd9353815cdeb04ad546e4d329846fcd62a36ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 262/466] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 3860e76707d689602790d2a998dfa3a723954cd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/466] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 69e5679a65a63af7b59674d311ccfca9652eae6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/466] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 4baf830b58875b8f1d61b68749a587e9338cdd17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 265/466] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 554272a2c9e954f676e3fcb9ad267220dc8aabbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 266/466] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 85274d734dad80a73fb041145c45049a8996d004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/466] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From fd0d735344cd26fef2fb2a9200cac4ae557d557e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/466] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 1868cf699aa014e468fd398d7b477fcc33af3ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/466] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 7416f2e7e57681ac554046ca3b8a1774bdd984e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/466] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From f716c3f852a1ba8783d4934b1bd8b14d08e14589 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/466] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 943872defbf5e1ee32ea260e6051f44c88adad3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/466] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 28f5a3c9c00ce1323e885dbd28753d5b8fb1881d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/466] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 7dbc98b71fc81d732432c49f9034dc023ad485b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/466] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From db64480b4e51dd91ead80a05a66a5578912a05b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/466] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 95ce35c4ec6bac5479a735863b83c3a232f800fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/466] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From a42c09021c08c96a46222e9f214ebfc689ec500c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/466] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 8bfb0d0fdd32cde24898f81de87859177da90617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/466] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e8c9e478e3d8548afc9ad1592b15dd9b6f5f3db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 279/466] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From c41f6012274d8eebb002bfa8f63143293183a0a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/466] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 969f9db9264f5e5d5f39e56dbe1ed0c09be75b94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/466] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 30ca0cffc86548068b6aff2dc8418e5b0cf55b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/466] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From f09c41818afc6f66f0c94acb29bd23db7d925907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 283/466] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 94f13d6c90407e1ec67a827b4e1e3061e11edf4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/466] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 1863eb452d5cc3da077f67476c2997f8989291ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/466] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f701b94b93f0a358f241245ffd45b85fea65ff81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/466] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 846b5fec36f3d7b9135b6cd838b794c9db3331a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/466] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From d357bcfce42403b35a10e1de926135f427a2e0aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/466] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From f666a718f58f0010df98aaa0c25660408273d51a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/466] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 64d777fa0e608d313037df85f50a8ea1b3855e93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/466] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 914460bd22e83756978e86aade53956a558d08c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 291/466] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 883d3874297dab182f00c4419a930053632da4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 292/466] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 7bdd6e2b72affab060fbe5befcae02021bb12b9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/466] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 346a6cfe1684ecbd2e8e24b9a45100b8889cb739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 294/466] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From a4e75750d48bcaee079dbeb645c65e0ad43d1232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 295/466] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From d1e2adb810970f0e35ed497105a5d86c094d6b0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/466] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e64cf7baf1005bd61a88848231fe5ec402ecb0be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/466] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 812d4e568ccefbd4fe337a498aea7880818a3e81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/466] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 92caae07dd82e3dfb97ceb19ff13de2a2eabd45f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/466] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From ef4bcaad7ec84504bed3f4d0b870664d43964e4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/466] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 856f5964c96e34ff358353424efb29e48c7b576f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/466] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From ccec53e9630d0afa4cd2a1b4be7a2c471621ef6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/466] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 1e88daff82631cd94ae7ab6798988023aff005f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 303/466] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From dfd07b2498dddc572ab4faa7a1a4b8d39a616901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/466] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 26492f67ea12fdadee2dbb57cd14259be2569c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/466] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 022c71b6c65bb6b1c9dd512d1f3cc2bcb8eeca20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/466] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From bb475792a1dd05e73a018642892980dd3b92efcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/466] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6a8da7197e7c555284a643cb781b313cbc561582 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/466] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 4c184711c0d8438c3dfb003c8f92c776c9731de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/466] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From f4c01fe86cf1b2ce698763ecdfdd9cc85ddfb44f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/466] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 04f9849b182b8ff1906946b1a2eed7a73c4c6793 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/466] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From faaba31422a4eb156a559b76ab11dad730a3ade6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 312/466] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 31f286e796256fe9e87875b639c392040330ab39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/466] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2d1607018f933f24e89da1022f82bd52f6d73539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/466] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8e2bd161aa2f35612af6e4ec8183b6c154902fdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/466] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From b83465b36d4c19a62766d9910ecb411043107fe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 316/466] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From cc1a5253cae3d17b04fba54c4262dfc382ec1876 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/466] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 1ad62e25a65d6f8ec60d968c06e759d910802f33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/466] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From d5fb6b35c9c82cba5c476550883c5c3720c92d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/466] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 3e9d1af833de2a5cc3540dab9e949a7e616d7b7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/466] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From b811d5d2d137418e22f037b3657d61bcd199ec6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/466] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 7d42299714c0c9cc32339e8718496e13c59c6a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/466] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From ea8bcaf528029024f9d81795ebd72ab551229853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/466] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 16c02325e349e32f1240dee2a9117cd5dc0dacab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/466] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 59af23f7b9abcadb6641dd31cec0d0f826310d2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 325/466] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From dd268bbcc30b5b93a08121d55d98b0a2f5e6ad78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/466] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 291b05317d607d591d65356e9909aded1ce57862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/466] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From b746f672b637740e831ff76bb40fc3b0e1fa1870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 328/466] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From ecaf027e583b134341bacae700b58af2a484d66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 329/466] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 97613697d725fbb59a3e2c61d56981800b69aa45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/466] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From e463b0686a91a568548d20a230ef82f8f2e4afcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/466] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..3c77879ff90 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.1
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 52075295942ba436dde247a11f5c28b19353b7fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/466] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 8f3ad5fd8cd6adf92aacdcb0054630a5658b1d41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/466] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b3a3aada3b27bbe2f37247ae8644e199e929ab8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/466] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 4dbb9ff0bb856baa9d88ef79cfdb921044c60d39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/466] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From bc9700fb9eb654ae899bfe06889801bee0179da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/466] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From cd8e395a3cb99811a95b91a6837072640b9dce1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 337/466] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From e16a4135f930ceafcf011d45f9d9f4c14ccb945a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/466] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 07d830ff37c9da3b24c1686e6fa5c02bd3905556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/466] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 0d1813a84da740907aabf4d16a777f5219406ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/466] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 3712f35bb47bb13b403a021b94e7b19e38019ae1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/466] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 2a33c9a49ba20583cc2aba4ddeac7dd84ceb3ed1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/466] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 100a3786a7d5c8227d3231bec20789649566beff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/466] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 09829b3a8188dafb4fc2db8e72f03ed967d3ec09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/466] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 7224953219adc7c9e255f065172a7292b5a92064 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/466] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From fc7e27ce55cc054852df8e2722c337b2cc8885af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 346/466] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From e048045ca1d2add8a2be2f31ff6e24e3e56915bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/466] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From af78e9007220fca08fce9f3c02c48450e14ba47a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/466] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 5ad16ec6d264be39bb3b4d5afeaa920ca0f603b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/466] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 20dd4be1fee38e32cef27f568e87017af13e1c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 350/466] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e017642ea3390a2ba75203be3c47a1a775fe308b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/466] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 58a4a02b81ffbf563f7d4d695a6e1b14b630aa1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/466] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 00d1814ad72c7c9f4796e8bdc4b8813b1c4ea027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 353/466] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2ab78623099e350b9b0c20ba8f35721b9a310d05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 354/466] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From ec366850640f2cef09fc281b1181e7938ac862ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 355/466] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From cab38b2c0eeb30dd8fdc94702a4314ec47daa7ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 356/466] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 4dc658b170f1c4c67ac72f3677f7e2f9399437d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/466] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From d6a1ae73bd83d40d7950263feb3d9d11f062d3a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/466] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 723b7d30ebc5d27244fed410459bfe019c15f056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/466] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From e4131fa9a67baff22baa750f75ad5eea478f7da9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/466] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 31ee832afaeae5334cb63f10a0bd9bee8595b463 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/466] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 4705f81a7282fd0e4b38f257595ce4cb731ffd22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/466] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 6bdb8915491aa5a20c23a4d8a3d636003d73520a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/466] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 46155548eb390404d6ae3761c2439a9c3086f652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 5c9b0d23729e83c2f43ef74e8ad20415d6f5e2f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/466] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 56c9ed9afa8cbdc4d517d5d4466d654bb9d1aa2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/466] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 4057e1d0f852842e7e81cab36b75c6d4dfdfb359 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/466] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From fc8c7305e73a6fd3e8dd2524e73910c693921983 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/466] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From be0479533104d3ad4389b206ad3ea2b8eb6a6702 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/466] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6a80b92a8df324444e28eec984dd597063c7a6ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/466] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From a02cd125232845422a4ebfae7113e090bfc53ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/466] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From fc20b7a884abb9a060a0a58bda7eb4f5c0f70479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/466] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 0fdc7267c461643f40e43fd68854f094f4b97ccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/466] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 0f06fecc5499fff071257d487f4857a6ab7b7790 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/466] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f63344ba47ad8253a3ae88123aeb73ff9ed8b988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 375/466] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 12391919a2b93ee68b7c67b999b048897180f684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 376/466] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 6a6c7fabbfc0d9234e28b0b8df1950b0ee7d118b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 377/466] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From d4535739de99d2009dd4b1d4dada0b47ae9094a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 378/466] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 44e3a7e7e33fffb6525b4c9f3264cc7947d99033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 379/466] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From a6fbdeaaf066abdcf69deba71902b8e8781216cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 380/466] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From d49eca4c9ed54a98429daa3e4d17c23e97a8bf11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 381/466] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 33d5c0b414a592569b2c841536032423d5121e3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 382/466] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From d228fdd19c909a7ef6be6a3d7f7f068489aed8f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 383/466] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 22100e6d581e3460300fd3fcf8c95568fa11bb08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 384/466] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From ac0872aeb54a8bdb7028bb6d410a58fd58c6dce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 385/466] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From dba9a25c59ae2a731f007b54e1d59a424d6cf6b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 386/466] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d1b6184bc115f0784e85fbaacd70a68fd749df05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 387/466] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 72c27de0ecfff29fb791e980fb479c64491b746e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 388/466] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 1095226067181f6c2520e9e2f366fa14a28d5500 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 389/466] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 43b38d08483173f5dfe6b38e55b535cb0bb6f628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 390/466] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From fe1f930aaa08932cc06a1e1c8ad12cd5ce3e6c5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 391/466] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 43265e271ae3366406b27944462d4203b7b03cc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 392/466] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 0bb8d15214a97c5569d6611403a29ca7952c9861 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 393/466] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 3206b9e5d151e9d1dfc9d543e08864c921f29cd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 394/466] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From f9bdfba119ed9ded3fd3c27bfaa3456f0be036bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 395/466] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 82f9c9c4bbf5fe151fc471cf6aefb3fae5ef2c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 396/466] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From c30b74ce86e69dd7e1a62eaebc5416df78444e88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 397/466] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 0884040c6d4f48586e796cbba19d3178947e8b0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 398/466] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From f7fb171f614889331cb5217fae263444816bf708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 399/466] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From c93fe78f16ce3d8beb38624aa46b1bc2cfb03b84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 400/466] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c332c391e5165dbecf5608f75bacde546bf3a0a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 401/466] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 5dba25d870af19bc25ca39b50fda23a63e2a4422 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 402/466] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 275eaa559b810a66adde5ccdf2e7591ea4d38a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 403/466] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 0b024041286f5243020689b641a54b00b62b85e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 404/466] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 97c3b49125a1b4188ec1ced866b4a59b7c2602bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 405/466] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0e641ab382646a0384949661f215ee35036f2fbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 406/466] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 9b3e0e6ab7ab40ef3388141987fd25c60487a3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 407/466] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 7c79acb03e586355b9a1e15dd8725193af2c1062 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 408/466] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e0ecc89ed2e67cafeb6d443894841f4fe2b6c253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 409/466] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 85f76ab1563793d27fb3e8a0cf77c31d64a51ddd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 410/466] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 04583f104079eca148c81e6693b4b2cb8ab32318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 411/466] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From e3101730137de0aeaadd8c81990b905b7fb8e31a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 412/466] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 748cf18af2b9e9fab034dbf236469061f6a9b571 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 413/466] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 18cbb84d2c183731916b234b0b2740f045e89452 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 414/466] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 4c153d59485e5032b3e1740d680dabc962f578d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 415/466] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 4297bfd9239a394001e4b9b7af69fb2d9479e13e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 416/466] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From cbd9f5589ef09ef14f17393e50737aea3c2062de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 417/466] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From cd84107195a7212280b1f095bbdd0431dde333e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 418/466] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From ec8ae8a752a124cba5a5900ac5715d31ce155e23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 419/466] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From b16f87e534f5baacbe755606d1038dad77651c67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 420/466] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From eb786d22ef1f485b8c3478e885d8e492f1e6ee35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 421/466] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 50244f5157bae388c5cfc176fb6d7a191d93558d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 422/466] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From d8fa5e20d26be37f5660d3d09a45102b63ac8376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 423/466] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ded6affad21a59bf0d8bda3a1dfaee59f1a6abf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 424/466] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From e626995ceed35e2c2c7f414c06e091a0e284262d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 425/466] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From a4e0b09e8ced5846c24452b40db1e7765cfa1c58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 426/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From c55c1ad6924c2742185fe670734f63f1fefb0b86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 427/466] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From ebe678e2d75e5c21b857c5d87e9d6fd436d02bc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 428/466] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 65b2ac96bc16c08fe921b72b0ae9838492bd81a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 429/466] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From e12d1162d13019cbcc7d6d8b9db00c8a5a73da46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 430/466] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From e3f2f9ac12572118cba0d615d17295d1ad7bfade Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 431/466] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From ec4cfed1cf4cd11ec80a98aacd997b8fadc04c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 432/466] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From fc5601b8c2b0e8f7bc43ea38716ade8bd0f6b9c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 433/466] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 96afb5ecec764b6f811a4050ef3437630f40332c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 434/466] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 5249543c370f425e5ff7e0b8e48e877e967efff2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 435/466] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From ab6ccaeff72196857f69e18fc2bf1e08b3f06523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 436/466] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 9f86b8004b4a788750e1b03b9bce200af8625fa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 437/466] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From a6b76a1214ab69bea18b11c6bfa15e69796b6bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 438/466] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 440303eecf7634aa05a8580bbd47a0e8b6e24137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 439/466] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 0231f78fc8c00a80e4b73563a680313bea362ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 440/466] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From af562cf276593f63cce50f3c06c2953fc07fa615 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 441/466] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From a41803909092ce3f53e8e842845a21a9bbdcbf5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 442/466] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 922ffdfaeaa2b8dd5c6fcc15e932a7ee5110be1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 443/466] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From bffb84feb6ad64f9a5ae0bc31a4b036bb86e4247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 444/466] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 2ee6658677c6528b4b9da78584f6d0806ec49064 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 445/466] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 378b27780b174edce6c2343a5e344acb400c1623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 446/466] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 8b3811127fa7a2999ece74f5d552a32a30da5528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 447/466] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 794d319996a4fb5fba8f07442005311d5c429f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 448/466] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 4a7e71507b25c4982365299c4a9b51712a7ab8cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 449/466] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 91f1c84b01fcc19f5d256373c9eba5b4407b214a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 450/466] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 18763f2b5107afe2ad97062d5d94762de05e03b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 451/466] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 299431d0a14bb3909a55fcb76ca3916f2469fb34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 452/466] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7fb186ddf72745f9350e15ce7bdea29789916db1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 453/466] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 61b207d5f6f9e63551bf94fe909cb05f21068d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 454/466] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 544f80c8658..add017175d1 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 0411b6c29e3cc4cdae69cf8d3f739aec7d9a52fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 455/466] mumble: build umurmur without Ice rpc support

---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index ec3be2fdf55..d214df24872 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"

From f6a4b072dbe5e10b6a5560eb2d90134f3d7878c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 456/466] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 99a8fb387200d045ad948b7bc2f8d4051535b14d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 457/466] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From be7d3e2284e74a0abbb8418fb8e3a4645459dc18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 458/466] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 123925a89fd66a068f71ce4735d09e575b1bb9f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 459/466] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From c8400341881aad56e51fb1f805266790d187d414 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 460/466] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 8ae18ff5ceacfddc547e7467295ebbff3044172b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 461/466] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 4564a9eea3616d3a724695763313c19ef3d2141a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 462/466] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 58acb54920cd661dcca35c12113cf69e3d74f6d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 463/466] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From af317093b2016fad78278295ae5a4c936a63267d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 464/466] Ice: remove package

---
 common/shlibs                      | 13 -----
 srcpkgs/Ice-devel                  |  1 -
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 11 ----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 94 ------------------------------
 srcpkgs/libIce                     |  1 -
 srcpkgs/removed-packages/template  |  3 +
 8 files changed, 3 insertions(+), 219 deletions(-)
 delete mode 120000 srcpkgs/Ice-devel
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch
 delete mode 100644 srcpkgs/Ice/template
 delete mode 120000 srcpkgs/libIce

diff --git a/common/shlibs b/common/shlibs
index 8ca98b799eb..fd287c7b9d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/Ice-devel
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e7..00000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
deleted file mode 100644
index c03824b70f5..00000000000
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e4..00000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
deleted file mode 100644
index d27bb350c74..00000000000
--- a/srcpkgs/Ice/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'Ice'
-pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
-short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
-	hostmakedepends+=" Ice"
-fi
-
-do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
-
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
-
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
-	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
-	fi
-}
-
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
-	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
-}
-
-libIce_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
-	}
-}
-
-Ice-devel_package() {
-	depends="libIce>=${version}_${revision} Ice>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libIce b/srcpkgs/libIce
deleted file mode 120000
index afa20b55e8d..00000000000
--- a/srcpkgs/libIce
+++ /dev/null
@@ -1 +0,0 @@
-Ice
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03851aff17e..2692a8d54e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -58,6 +58,9 @@ replaces="
  gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
+ Ice<=3.5.1_24
+ Ice-devel<=3.5.1_24
+ libIce<=3.5.1_24
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From 73eb6c2e4645a335a91f2220934146a587b7d6cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 465/466] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2692a8d54e6..770c03b8ac7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 4614a491a78ee51b3ab3c25263f63107b0d22156 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 466/466] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 770c03b8ac7..54d8d72745e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -249,6 +249,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-782933020

Comment:
IMO we should have a post in voidlinux.org about this as well. Not to ask for opinions, but as a heads up in general.

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

TODO: News post

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 581478 bytes --]

From 2e3a72210030e71eebceca668fc0988e7397ed6c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/465] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index d86b7eddef0..6a506eb4de8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3445,7 +3445,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 440cc90b90cecd6a650f4319ac5b83c626dcefe7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/465] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From b685b8a44fb56bfb58fc154b747cf27af4c44fff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/465] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 09bde84100cfcef299ce6ed38da8249c290c525e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/465] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 78188c2dd44ea542be443d049ff57f10c9799bb5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/465] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4723e2ddc526e3b443e80b0ded6346b657199451 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/465] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 6a506eb4de8..54128395ea1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,6 +1759,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 9ddb1407cdf2f205924ad756095952c0f0ee6220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/465] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 54128395ea1..bc58ed6cc0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,8 +1759,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From ef3f375e3427012630a68e5fa30155e2433b08fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/465] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 20c3f6791c26a928fb7662bb5705fecaeacc440d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/465] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From d3c540173f16c1991056272672b2aaa2d16310e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/465] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 0d89978f86ca93ba4f2d1aa4d341b3d92b33e36e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/465] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From f7d0dd022ebd7483e956d4a00176f77dd4f6cae7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/465] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From dc8d7bc228f3af5d17fced5ae8bfecbb3e854ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/465] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From f97c1fe36d486c9dabc7bda4a18411256bb5a105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/465] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7ab6b6f8e215343224b0b1db12a2cb6ed8ab1234 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/465] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From aa03b4f6a805f1b089d73c0ef3682e082cdb32a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/465] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 5cb32e16a7cf1d7496dd02a4f5b31f7bd5f4898f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/465] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 54e43f9706327a9c10b6856ac5f28457203314ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/465] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 33ea4caa0512ddcc3900af5e8455365a45afb484 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/465] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 41d30904258ce07adc3a026f2e641438ba74e9d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/465] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 846b5dd5cc3ddd629b30dc5584f5b61cd8218715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/465] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 578ee3994686788b6fd7ba7c823a2e1e6605799d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/465] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 84776086dc97c1935dcb7b13d39b2014128edf1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/465] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bf489e88dfc3cdc152f0fe3054c406cda3843605 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/465] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From ce133fd6818b136b7619ef29240a00fa8a855b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/465] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 55e37955974a19933e72ff7cf8542556fb3961c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/465] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 66691d6e1acf663660bd512f7d70570d76b525dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/465] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 47b33a1dae3478254b7c007bda060692bf8d9560 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/465] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From e0dba1e5e427f87e6e89776e7ad68f6665f6a07c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/465] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From e1c2c48d042f2d921174341619295937172c154a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/465] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 909069fc8e2a2b12a953d5e34dad8bd8728b5e4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/465] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From fad8f5e223d7010107f059a0b41605c51509fe57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/465] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From bc760d5970d3818955671c63e20b23865ef1ef2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/465] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From faa392512e6227749986d3d858cc36c19e4b2047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/465] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From fa600223b6f18444552e6c03d0f99b1b1c7330b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/465] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 49b6a1301cb71e7491bedd7bd24ced8480dc1099 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/465] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 8eb7e23bc541be958f9d9215370bdf1c294becb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/465] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 90617abe884d9b143847d46ff063ac115e124102 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/465] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 76228f6b5be378d3200f2d49466b57e5057bec98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/465] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 578596e007a8388bfc1cb02430b73c2b57468501 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/465] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From dbf9a876a1f02d28fc64e5662c38de43d73bc1f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/465] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 4856af9ea2c6fd0e5fa2bd1b42c0a978c36f5ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/465] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6004e201e7e9e9acf9bba317ab3da8273863ec12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/465] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From f9225bdf10d0bc81b2b2e28eaf574f1d5db2df63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/465] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From bb3a2e74efa62f2b9b9e632d8a348097268fecc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/465] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From c98049587f325ad5580285485e2b20c242e74df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/465] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From d71e996b8ebb60e1e84399d184fe2d126585aefe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/465] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From ad43568244c6498dd50121b3c540536a1c694961 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/465] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 018c45a1ec0608c8eaad6657773632dc69f005c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/465] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 66d1daeff47fcc4e05c5409d9ade0d06031da895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/465] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From b5d6d72a1e97b0b80cbf77785df89abfa0b979cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/465] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From b55c84363ab8144ebf9d9dba0cd254157dc5fd32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/465] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From d703e15bd4ba3bf9261469ee04f82b5faf2deeb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/465] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 4b490f8b877f37cd0d34218aae004c05aa460fe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/465] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 2ba6836e712da5989df980942d4eb0d8735ec531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/465] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 5a65f96e8851a0c79d5ca7bd4c8034fe81bc1914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/465] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1a9c1d3a09641a3c48d67163f65f31172fc1c735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/465] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 0f4680b9457b01562d069da8290a7c0ccc0ad25f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/465] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 61c9e997e30a155b05b09288816960ac5ea41445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/465] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 561c237ed98d35d38d7835ed9d56d379538e4ca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/465] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From f2a8a41a1192295ee4f8cd83f917c973d9364e80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/465] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From f6ee6b1c897d3de74a7679157208ae8777f75453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/465] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 69fe514b026d0b27424b48d79ee687e95ea2e157 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/465] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From a82ad320b6418a4fa475a0f673cbab2e8fb9b111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/465] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From f963403d9dab382b8b5dc1e0c2cbe8c064394ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/465] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 16ff0a7bd46ed5a6365742b2fecfb7b1e22a2335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/465] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 58cc80ce93b0927526273cd699623375a3e8f2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/465] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 681af431ab4ae5b29fdc05046f353945de32950c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/465] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 4fc5a3855d9b50f3391700557608a119a637c700 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/465] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ad59fed81b151a15d5058f2bbf23baba150e1a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/465] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From ad42392092baae2a0d6516c6dd2b3493b8962f38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/465] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 0da027568f800b482871595ade7e1d97d1407a31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/465] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From bbde9048bc0b38fddea491cdb6e5f4b745b1a9ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/465] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 9890a86939dcaaec24d77a207856875a50fe9860 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/465] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 9705e1fb19fa578e822f1110be51300c010321df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/465] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 037310b1137ef1dc0099568d9199d2212c15e21d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/465] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 73a0201a0eb96086bf507e56d706f550339abf0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/465] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ef34658fd317ce5edb0487a1b363558990b34df3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/465] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From f697dec1dec5e11bc288700dfdb33c9e9259136e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/465] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From a90ad230d74b3e384b87dd42c28a8f50657be0a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/465] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From bfbfe5a9d9d91eaab0d67692448e8b3808e83c1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/465] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 0f59215ba096bb74eac2cd8af0613bde4ffef0d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/465] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 4fa9757b3146cf70e8b1951699b8358530762cd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/465] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From bcd3a0bb879a8bd14ee70fb6308e124a6bd8445f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/465] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 68d1bb851321824263cfd910f0c39cd8b8e955a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/465] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From a715d48905067c2e48e8536db1a421f3c9bd6b6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/465] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 5c1aed33ff6fc6e31553faaac2da869760caf571 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/465] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 651cca6dbf12f89e62930af602d785506efee72f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/465] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 8ba2e505fe0e609e14f7647c9d91accaaf5acce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/465] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 3ec90394c753690ca550b3594e74be239c4ec740 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/465] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From e9fbd12132a36b32086b4b3f4bf03d48f54887e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/465] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 3d5bdd4f8031db93c51d7ea8ef63371f436ab973 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/465] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From e6cae542148825a476ea654e079453d6c0633f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/465] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 9b7d2d7b8c11f0a86eb3c95b8f8c3251d0727664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/465] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 8cf8115faa4c4faaff3fecbfbdd06994d9034c86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/465] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 78b0975bd61b501004a4fc7bfbd0baab7601bd3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/465] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From a412110479c9fe3d801083b7a1619326d2ecb48a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/465] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From fc05686cca7a6c2baf1840c83a1daca7f9e27b55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/465] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 3c4983262852dd026904ecdea4863ba002532aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/465] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 233fa70a6bfb3be44b812da9ea57212b2ee7e5a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/465] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 10081fede2da72c7d9b9995f94783ac9785b0b3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/465] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 94739d4fbf11e961a0dffee159167c7bdedee42f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/465] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 44fb82628a512551666b41f345819a1c575f8c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/465] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 10a913270abc209a85351226f86c51cf201a1c84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/465] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6880ca343b3544bf25722f0ac39c78bd7e93aa41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/465] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 3c58b0af4b6f3220a98b3a4739aa227b08821fca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/465] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 6c97f573001ed658b46c21f35bf2facb94d826a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/465] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From a32573beec9f1791e837166dd9c263d4c96d27f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/465] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From f44013fd65b5af663603e55419a0cbc3447d1913 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/465] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3d67f1a09e4ca0e383d371609a78c554af514e8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/465] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 9e4270e8a6de07f73e3134d6cfb1635b5077d48c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/465] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From cf4db7f2560e8c2be3c3ebac72d240641b3ced4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/465] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 5ece6d027a5bdb322f47ca2cb8314353a1545f93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/465] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From ccdc6d1e338dd39d64337ad0c66b531b28307ef7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/465] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 61970632fa6589494fad01f5c794e51f22613cb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/465] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 7bb1b3301719d3416817a93fac29f38741aa1010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/465] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 45ee0f6f9aa3ff7251921505d38c52f2cacf9e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/465] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 79900b21a34a29991fda30792d9faa8635166fd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/465] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e4fd3dd222a93d2d9e1ad9fd0c3ebbcf8aa7693b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/465] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 8c15a73facac963ceb13ecbac3b984d1ae541881 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/465] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From ccab2dc1d096f539bbb9efbdbd211185b11e9c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/465] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ea30ec259924537005f8d15a215d465a6ca7ebbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/465] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 07e81765a2ee3916de35f3dd7464f65d8cebbad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/465] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From bb2f3e4f497bc8331db4f2669c56528b9d5d3eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/465] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From a04e43fbcbc898e4aa071c49becb2d8c00f8b24e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/465] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From ebc6a19ed54251adcb50ec5c9e3378d4937c6b52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/465] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 21ddbb965032a3f5e081aa5679286d9631408d04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/465] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fc230613813b5c0773d2ec25c1a2c58c787f716b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/465] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 4e236ded60909197df68c91a7291549c5ac90b90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/465] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 485b8a9aa15da4284d2bf8f612deff5f9e89b840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/465] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From ffac5e3d486bb6fbfbdeba231b0142369f52bda7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/465] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 32a4f241d243f2e50c8576c24187249cac0be085 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/465] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 9d901ae44aa75966523da137be274be91b8a6145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/465] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6948c43bce63724b5ffd7aa211e89a7d2a09e684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/465] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 143db96c7a0ffab0e047c118db74ce0754a7a4cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/465] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 05c66541dd3f069d4fcf09923179581c47a71129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/465] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 250a76c08ce93ba94bfb725dee26343d186ef6e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/465] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From d7899a899bfc7e5190fe2fefb5a03c2366caa138 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/465] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a99cffa2758041d61a71bef5975d8fc0ea3d974e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/465] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 0680c5efc3f75b3c608dd97a98902e1f2173dda4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/465] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From d7b67485ff22a433e9de188f0b5723bf02f8f1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/465] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 1f2e5ae63fe4b561bc3da68d28b5977c7fdfdf16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/465] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f3f4ed86e08dc1ce49d7019a188687c4e48412fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/465] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 048a2c72ada867c72c00827fd5e5bd304457c30b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/465] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 4d70be06befa6220f327ed66070959c0c18031c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/465] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8a6142297c87f66db947c0bba1df8f019a522373 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/465] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 92c5b1832748eeafe6c6c068d4705f839e97ab44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/465] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From a7309475547b95d48144803ec3eb1915ba1b4ad2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/465] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 841cea6bc83c96780f1b7ce08cba66065b9cac47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/465] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From b0bf25adfb103de2936a85b3516ad7925911c5ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/465] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From be0a21075da3f7e17c4bf16c0c480c116376e2a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/465] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a9ad92baf3bd1df2528512274b63f3f96a9d82da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/465] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From b35f6a939e703c963fb7dcf067aaf421c1371b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/465] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 3b04580962dcef4265d3861410504ad2f39a7117 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/465] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 480eee89bfca41832ccbb8becd475d915f0e960d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/465] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 21f785a40a197235bc5200b462463589ad589481 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/465] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From e3c2703fba77f7a73dc857e54e38340ec354eae1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/465] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0f0237cf06f803bd6b4dfc68a018a7ffe51db96d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/465] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 40311f98da2d17b4bd4d90b73f9af68f555fe13d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/465] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d715f833ec3a1251ff213dbb9f7b146ab7ad2fe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/465] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 164fd539af82699430ebd0f3017e20924b890ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/465] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..e9c2be9ea18 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.17
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 87d854ff306901205077d538ed51427795fe9892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/465] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From ea7197a80f1bc1a0651da049de94ed804f9fb577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/465] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dfd4a40fad709f9fdf4e7aad10ae429730299a05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/465] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From bd4c5999defe67b504715a93124fdec208247c4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/465] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9f26190d66c28f1dc587f4f1d574db620cb2814a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/465] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 3f9a21eada2d24458d79de36b5140b4a5f1f4b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 167/465] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From c99ea0069d21080ffbace1fcb6bedf68a1cd1e13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/465] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 4c38ef612a81caca9d2dbf426a3224dc55a07d9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/465] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From c9dda957610ce36dc6ec06560a87642469509c6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/465] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 3f80174fdeacd3fb3fb2ff510e218f24d3d4767e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/465] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From af9c20f460118bf3e4d7f5f1ffaaa9c0b19d3989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/465] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From d5dc45d47153595c0581a8e9ebd19f7766bc5a44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/465] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 337ddc351f7068b8a686bf144f69e05cc1da4b0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/465] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 9c47caff9654c2bb695cbf3f411575d03e70dd56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 175/465] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From d9b358e9e0a1c4ebabdcc580078d9151abf7c3bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 176/465] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From e19ee42f1b724c7325c2c8538f5c594ad95eedc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/465] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 6907734b4124beba0a8cb8a87569cb3a16b36b90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/465] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 3d49a9446e5e8b88b3e6974be1ec67a3993fa7e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 179/465] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 5ec27271953cd97c982b16faea35ed72eec13ff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/465] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 33c6afc25d229cb48f2a5b30832c32ac1b516f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/465] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 6adc01831176a33dd99825710c0a08048e1be1d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/465] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c4927830627a36da7237f624f31d5bd19baacf2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 183/465] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 06ec462b07d84d014be4141be015993adf78d56c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/465] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 877273117cc68ff5e5b83b746c33e7ad58c84e2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/465] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 36486124d539c506e429e2f6f9f05c27f3808e86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/465] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 25fa321351dd3fae7ff3c826100d1ce654040c5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/465] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From e61f36ab46fc120f68f5cc49d8b37d2acedca4fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/465] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From c35a5173039e11fc00f8e1af7a50d9eac15f6444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/465] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 45eef22952d47159c2efc95efb75df554d76c760 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/465] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 164ecfd09618ef2ff50d75729ddfb2afa4a1e76d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/465] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 69e66a5031cb1b914474b99c4845e1db98961a2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 192/465] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 59be1a9221c1b7f8553ada066cc6b8172047dcaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/465] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 2acbf4cd112aa0f09e8bb855b1f51daa2ef66e8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/465] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f1a53d5b5d969d1782f44b64f49c5b08b834dfb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/465] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 587b0f4ec6309db89aac50f2bb26e3aaa9f02611 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/465] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 97ccef1ed5a68b8d53d85410b9ac90a36a14519d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/465] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 07405694b81dcf712743378dd3f171b128c74a42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/465] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From ca9ecd6c069d36de2302360f72f27cd6bdb0146c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/465] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 4c161c64457718bc8be00ea500b6b03ace8d0457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/465] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 88d99b9717e3d6d2bcf9e618750f8f0757faa2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 201/465] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From c2daf9935bc0b97eca74affab9a52f1f6947283f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/465] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From df5ae1745ce9b6b8f88f11afc25b670a20a4df55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/465] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cd71487f67f2c9ac2660d3a0fd8ac870a10678d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/465] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From c2cd7e0e70b99cd79053b35ef38fc7394c5577b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 205/465] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 7a05a43458f93a54f1d02ed643b867eb5fdf85ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/465] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 56177761ec5cfcf1ba3e5ef3ddbb54705df9e31f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/465] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 415cad982d1e3760e37246ef1ed1af072e9f271c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/465] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From d2a7ef2bfc34eebc7c6c8a41603a1a815f93a030 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/465] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 9837c4c043a06bbfae7e095408187599eeabc6a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/465] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 6514bcace75afc9826f66968ddd50b2f17d16014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/465] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From fa8ae0458e62d12fa600cd0e59302b20eb808c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/465] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 58b954a02fd67ae04eb550960d80778709a0f704 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/465] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 68ccd9d067760fcdf95833b1ba0185b88a15d9ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 214/465] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 19f08a5305e61a1e58f923dd31dca7a1904190f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/465] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From b9c113df4b9f0d0f82b463f32c8c887d2c44369a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/465] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From df6395714c03665fb9d59ffe5ef05b5fa3191259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/465] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 5887e229049fad3f34ea5c80c1274ca0025fe07d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 218/465] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 299fd1eb217e2632ef13fae1b822a3f4ba0ba763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/465] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 3b17395cd8e161c330aac0aefdbce454ded30e65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/465] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From ad673b3a610430608106d1b7c2ff7d7c09a141a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/465] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 8f695b5486a9efe36d638a03b886308e729f414c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/465] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7e62d2c7872313d377780dc4fd0c2d23ac37637b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/465] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 9c5fb9d5e2e8ced053204aa69eaffa9b9229a83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/465] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From c15e948607e095c622c097040830805ea2323be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/465] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From d4ca376c48b8d912add5af660255fc8f017ea54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/465] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From fe441af68ed103607469d3e1c606bc3302ab5fcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/465] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 606f7724608fceab2439774d9dc6de88381c0748 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/465] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30aa524658b860e49ad04f2d10b9808625b22d2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/465] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dd4d05b8a24eb70c95b0382d6e38bb7f7815037c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/465] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From d4536983ab5d77dfb8723ffbf54d2b34a29f6d80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/465] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From db2337ba827fc419492f292efa2e156fac3a4448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/465] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From abb077721778660b7b327a12e36ba2da6353a363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/465] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 765ab0e2aa72e1dfc8c299a216756684f70bb575 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/465] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From f9c8af8ff5f74be9b20a608ed1ec47f9f6a23a41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/465] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From fd7867e3131b727f2b2a697cdb8082f53c8e29d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 236/465] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From e622e6680af7011dfb50ea842929fc130672461d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 237/465] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 8122b5d87384633a74ed7f90256d24fc0846a05d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/465] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 5ff399a926d566f226345dcba03c3e4d11644db1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/465] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From b93197e3cdcfaa9aafbdf1d718f851d8f70fa2a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/465] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From dcdb6aa451b5d48324b971ee5010dae463936d7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/465] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From b1fd75d9516016e1a952d5fc4a9e2175fb510914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/465] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 4c8ed986c28ba47145d36513bba6932b7272777d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 243/465] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 7b6cfad7f38f1c20df0b751028ee60264ccdcefe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 244/465] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 367b555c9b851765578cfcff3c7d99cfa3c6aa47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/465] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From f7c5a31fb43d562ee7d44ab6be96d4342639d17b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/465] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From fe5ce2b63e3bff08d898bb21c9de2f2eb89a9920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 247/465] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From ca07f4ad2a954ccdf005ef5aecc132fa3366c17e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/465] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 4ba8d3c3263c5a7e67ec44844753685ee8f7f8e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/465] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 1bdb37598404370ac27039baf4487b93c240df21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/465] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From c7e458fb001b41a9a64bb441ecc991a799e27058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/465] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bbce938f062e0e8003a73d79fa286cad0fd82716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/465] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 0ec5db21f896b32bfd496a9f9694ddd940dbf94f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/465] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 86a390c5d61807174556a7c6a54a5c4ed84142c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/465] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From d07734542fe76c7b13a7305dcb6eacf9cec9a8c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 255/465] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 920632c6cc66441aa5695d8b79678bff639441b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 256/465] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 870d2b1b78a15cc5cbd3ba43defccef1fae5853c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/465] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 4cc68f1353c3c1fac463a5f011dc2427d0efd60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 258/465] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 7c8254eec40f0a479545ab99fa0de9236b6a5365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 259/465] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 2161283dd135000fe64a0c583c7e7a7e30867d2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/465] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From dcb68a02514101eef385465f4a5dbc6e4c12f551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/465] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 655692c1101d86134342291c9864babdc46d73ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 262/465] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From cc0d5d684e5216693baf12ed1f5d41809b127c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/465] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From c73bdf515868282d09044795d14720739dfaa17b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/465] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 3a3ad1182284d9314922e4bf61581789f37682bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 265/465] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From b196f65e0167d6edf4dc81707c0e4d40bc23c66f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 266/465] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From ca6982628aa263f6f84850853419a643dc98e63a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/465] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From ff0218d361421ea57123f25743240484d4ed918f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/465] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From e8fb28a846aec19cb0656bf83a729d050bd0c234 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/465] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From e3857bf1f4d9504ef1eb58026cc708f53226eb6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/465] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From b6b2ead8ef9432a3332fb47ce2cd6db342f4c6d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/465] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 472c2928ec67cf8ab0146132e80aa27598d25868 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/465] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 10c791deabb8470cf984710fcc2541507d38d33a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/465] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 296f8edbf3975c11f2e40a2773d0955e3f5d72f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/465] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From a06bbac4e0c92262a8c4878a34669778f0b797ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/465] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 458dae79a51385797c27692e4c647216e672514e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/465] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From c9e7815893aae9aa54b0f380e726d27b16c17f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/465] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From c580b9577f458dd6117d002474e22bb5ac906b08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/465] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 12b8896a70ce4a4257101c7691a3775b1b31fe26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 279/465] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From fab6617783e3932d79cb481585c3f48cda9c30b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/465] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 08824d3557254fdca35575475a2d6c05cd29d0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/465] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From c16eaacc281825e7b494ede35856be8f5694c8c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/465] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 379e062681ff24a86ae9b3662d37dfc1d80e6c6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 283/465] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 97875a351c1b1d69245fc683e590e285af9407dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/465] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 02ed7308a8b5a1621505097c7794373fc4ec44dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/465] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 73b19ce152b84b37b197895e4df76b52bd7b5fd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/465] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From c6d14028a5bc78d64d1f59cdfed8d200d3c99fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/465] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From eee389e32ea979a341189926c1a1613bec9f6a28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/465] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ce9efc2c2a581ef30ae4cd0eed4951aa0fc23027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/465] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From fd9ad31c650a567f8fa42f5e0836ee96cf21b3ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/465] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 63dcd52f3e51b40395bdd592399e64a7edca91ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 291/465] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From d98e88329a120374af4f723e774abc1f52db415e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 292/465] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From b2a88c8d92b3ac7ae870c012b2516d4172b22be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/465] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 44942d2d73bfb6d4265e39460d57352891c297d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 294/465] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From a59ba3f2837817e4c7b3434ab0885ceff7e6e842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 295/465] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 79989989fc79791e9f76bb9fd0c9034bc2ff5719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/465] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bca1e33c95a105645d9ba850314241b4bf19859f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/465] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1e76b845edcff5e88ec5c78f7f79e95fe5058ffc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/465] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From feb979570a4a699fb876b46f20c51ce9dc1538bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/465] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From d332013b1eed913bbaba48e96e033ab2e828a694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/465] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From a5c47fb620f578374cf760c35b3a609dafe7fa5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/465] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From e8335471b50ae9d0413b5a9007ab947b07e29f8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/465] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 2f10898a5b96f583b4c924117802ec11d568412c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 303/465] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From e8b0b1a266a0d5841f8d0dd8218ebbbaef851d40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/465] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d2fe1d08aee1baf417eec826f3273801e0a2eaf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/465] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2828e919a2cfee11453bfcfe67b065faa1dbb785 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/465] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 4bca3a6773caad4a27da5f809ddd57750b19dff5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/465] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 5bcac95ca4727aeb2312bbcc630a4839b5c07220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/465] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 372aa900fc13788ffc041796d218e6f66fddab49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/465] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 67b8595224b1a2db3b7a5e970861dfc0112fe891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/465] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d0a2f510ecbd6e034aa59b959bb504eae14e20df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/465] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 688d3801bc84c88f8f1278e1353631d18952564b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 312/465] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5b16a7bea1a9a92ac7d312b2a101fa814ab20635 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/465] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b3f2fdeb2c31cd2534d1ca60e1178820aa2b66b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/465] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8a22a6888b5b19559fd5cdedcea208817e36bbaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/465] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 08c93dabcf0c29613817922e432ed12d70cbc1cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 316/465] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From b481b38a2e5ad1a6d623be864f62381057b0dc50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/465] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 58863c36e0a768b09657b3407ff6e70e1506cf10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/465] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 590ede790dc268c4a6128c0338768245f9abf77f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/465] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 41e4ae4bcbdfb30b2c1fba2308444e1d7a733a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/465] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 24c0c897347028e5e5828174e0c99c05a2c57ad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/465] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From d3c0ae47e8a09edfacac2bd99ac05fc796ebe89a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/465] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 69456846333d0062efd4a68a04f984c0376848f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/465] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 801ebdc24bdc872e24f8c5136a9b5a4af8d5fafc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/465] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3c2865fbc221b94f58099fe4c45dafdf793bc3bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 325/465] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 995b8a5571f35c124d23d9047a56ee8df444eb4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/465] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 4e5427458ccd6823289ba9fe3e336defeac9a985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/465] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 1d1bb89b71f339d6e27b25487d8317aa2290fc1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 328/465] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From da9645e4b9c233a23cd4650f652668bc647b51fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 329/465] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From d493d8860817437eb1a64d62980c85dca50770aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/465] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 1126ba38533f54e56d678a1116d6db7e8f62a071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/465] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..3c77879ff90 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.1
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 4f546f3aec633a2186a19b85f319f0dca3fbad28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/465] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 504046059b36af93d1644821e1c80f5e052fa536 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/465] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 0d0d80e857992d486d79b9fd904b8adcc190c23a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/465] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 3b2be78f885a9c84e2480e7bfb358f798b4fb681 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/465] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From ed1d6467d9501eb234eb1abc1e6b7a6c2f1cd4e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/465] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From b38e3006a6bab36969502700c502d379e0b277f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 337/465] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 11006437c2ceea951f8076031af702f42264a0de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/465] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 5b9666de2b47cf0e298498663c425b56a026585f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/465] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From bc95c98086267560e2bf7480810d9570b21feed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/465] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From f36d1a042f598cbcdca78d72e93cf9b56a7262f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/465] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 530ec86383b4f2d2358c90b532d54b930567ed32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/465] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f383dc88e771a8d507f5e1bb2059e964be4f951f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/465] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 0571ee943ad208db53bce8bea0ad6c45a09a9d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/465] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 13899d1f594b79d2ba0ffe57c6047748676cdce7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/465] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 154220a276c73b203e6162a65f1aafca0d11ca54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 346/465] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 647b7a395d7010e18d00b0d9f39eadd9b1866315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/465] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 5ef972f470eb4b6106fe9a6170a8724a71dd2351 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/465] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 4c6cb67bb84df6baf4623f769c07722c6d6fc385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/465] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From ac1b7ae0f00845b9949f4982045b3a9ff87e99e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 350/465] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2dbb2f83dafdd405cc6cefe645de0bceffb43983 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/465] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 3b02d199af67309dd976dcfea0c7fb5ffb7a6439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/465] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 86a5bd0a363f253e2191d1e99d04146955f2fff2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 353/465] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From c4d1e321f7ed49782a476e08f1a0ce6f5110a35c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 354/465] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2327e57a95e6d088928fc95d2c41b92fafc412ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 355/465] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 5c82cf5c0a377e313b37d3971307f278ce48fb43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 356/465] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From ac695f2ec08578a5eb72bb1f57e0f1916b782ab6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/465] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 378ec161565af5b51a5f3213f7ac9fff06f80fc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/465] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 3b44a29c4915efc238b0a6351f6641b2b1ce8b1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/465] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 3b60493720446684965a40bdc8e773d69017db27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/465] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 8dda8b076497de1cbd22d94d48093ab3f195490a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/465] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 371127bf62814d76a10a2e201d7729a81fc89981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/465] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 93fd111bbf692caed3e6a7c09326308cbe4b6b52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/465] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From a145c64773e4ffb7e9b28f9d2549dbcec6c489d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 614c357f0cd6d6f4e5f83bd579574152849bb02f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/465] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From b0e3520cb1df3fb17d97752dabfeb9b8f4c83091 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/465] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 00bbc24d0d54dba8c13bf78316da34629bf1cdfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/465] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 6857444c52409edb1e5aa15ad3d5bb57cf024689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/465] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 58ab06c6e52fba70a52a59b63167679cdcc6c0da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/465] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 7f04eedc34053ac29f720aa6ba7bc196919ee619 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/465] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From f826fc9ab4dce1b23e92b63c8436ebca5f9d0af9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/465] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 86975ecd1df0a8316fa9a5f508b82e43124aa6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/465] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From daf9dfdc6062a8722007a08a8dff13f4d483d3e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/465] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 09e727f56c96c25fce26d61e30cccdd4782a7c63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/465] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f34db372d6f5632405efb1c818a20c0f85a992d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 375/465] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1eea8ecdb825063da2ba45dd01cc0eb73339e6b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 376/465] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 08155c4bfe5929e6c775dc76e17b61801469964e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 377/465] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 8753607322a63204617578f0a5f2acdffa41579c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 378/465] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From a2209067deaf73a05de5a78efc3f448888431180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 379/465] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From a780207b848fd2a9de5577dc3590462892191d06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 380/465] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From b52c7e3e95b16fc23d9776aae713bae19a90ec1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 381/465] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From bf6095def720605cf7af85ddf20e694b8504bc01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 382/465] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From c8c1fca2673245d475b7db3ca5ec649e9e449ef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 383/465] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 477563cbaef224760f67d68d9cbbf996457e9291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 384/465] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From dceaf464e679fb88607ddd4487a8cc032adbd25f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 385/465] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From a6176433ccb2b4d03402d6d21eaa21965836130f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 386/465] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From bcb98c084b14fd0f1a390d5aaf8912c10b9699b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 387/465] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From b565fff93fe6a89692deadf4b29414ebadadfc91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 388/465] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 848b7ff27015d55eb235316cafbe64db80f97708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 389/465] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 92160283c7e6efefeb7802c1af454cc19031559c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 390/465] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 1857d0231a1e5b6d483722281a75a43747f3d8fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 391/465] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 0d1cd40555dcec57a45038022659202fa22475a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 392/465] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From ad5a6a7205e1e6de60ac038645776268a2db66bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 393/465] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From ead6204e3e3cb829deb7cbf39a8193863e19899c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 394/465] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From d7f82a5689e46184cb96ee380fa520de8ba75158 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 395/465] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 484fa7543c2aafbdb8b78fcef336faef46ae9520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 396/465] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From aabe038839b23294e8d9e64c19f3af1762e8de29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 397/465] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From fcaa91e14b4d87ad0849606feca1f12bfec37aa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 398/465] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 017084f3e133d6740aeacf3b96f7dd593432ab97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 399/465] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 07ac714617995202183cb63a3b9949990e75a66b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 400/465] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b502bf1063a85c607347f692b0295db23c46e87d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 401/465] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From e5841fb6c0be1d38b70e5e6f5178918d4ae0c70b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 402/465] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c9237ffc740929a92a4f344685ef4c83097c3a96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 403/465] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 29ed903de57eb757b3282189d6e048365480fd28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 404/465] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 198f0076e8b80678b4061f89511c77946313ef28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 405/465] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7bc433f76f415436e9485824b0b2c44cd0432577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 406/465] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..c3cc569db15 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f2b426874847534cf9f73f086819310424c36d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 407/465] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 9c5bc9a216435fe43b8c469c2d0dcc534298641f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 408/465] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 7057906a9e84d3528cd3ab1ace2b136d45f987fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 409/465] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 08c03dabb03df56b9df5a14ee0a86df78711be80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 410/465] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From f89e23bf28586e68effe6ea5a99aa9cbc71ba67c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 411/465] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 8a0ff699e06f02277c79501ba70e20dfb7e91fa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 412/465] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e64b466da59fec4d23c5744170be449c15d5b709 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 413/465] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From c2027cf999b656507afe54cada4efffbcc69af8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 414/465] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 015c29a8fbff3ed48a9f169eb8331033a7e5fe49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 415/465] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From ea8805464d9941b5307988cf2912eca88f2491ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 416/465] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 82c73582fdda8979e194c7972b357eae120751f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 417/465] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From a1d074b8e1f89c35a142739c7f3379a181ee09dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 418/465] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 55e02c43c207bcb2647b49201d69a9c31ba8c727 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 419/465] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From c5e719e73a09017b30418015f7568779bbe99deb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 420/465] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From ed4ef0e550c41052d3b1e471927fbbfcad568127 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 421/465] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From d9224b76a78fc33bfd01a3dee6903492dd7a118d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 422/465] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From ac449c376ea4addaa8d57366c86fee3bd0dc52c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 423/465] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7a36492da89c10b21b4fa6f6c71862e6427d9cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 424/465] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From b1aadf1f2a0276f8f9b700fae6534af22cbd04dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 425/465] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From e4ccc468f1a7bd52eb895fcd5a4d841cb04e19d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 426/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 8dea52bf364087faac5b99831fd363f855ec3f48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 427/465] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 221ee9c424812991d2f4a3416f5e1d092a75e7e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 428/465] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 24cfbc7b8cb97296b80c5b6c80873169fc343633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 429/465] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From c1678adf61afdbc3b7f2ee8a9ba9251536ab230e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 430/465] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 840d65628ce95a801463ee6d6d6792d6afafa3e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 431/465] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 7e9bf52f8ee1af9ba1c010ea91ab903e19ad3a4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 432/465] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 9fc2ae3ec7d53b7f8162de8f2f90a330950ec6f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 433/465] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 0feca9dc2043225780c9954156ae4065273b2177 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 434/465] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From de180b8d70b3886982ad6e48b8eb8ed7e0658c6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 435/465] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From deb31942d52179c164755e70e69a00f0f67d727d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 436/465] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 44b6bc90eac110d1311913a2f35dc6e8a8a6a9b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 437/465] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From d226076c82c540f4e5d280367d4537cd036f4136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 438/465] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 7b9630f2a0b797230bbe0405efee2bd740ce398e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 439/465] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From bd76ba3b34b2476df6a18b1a75921d80ab4f7a2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 440/465] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 407838f1ae3a9f4d634021c3122fda84c85676a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 441/465] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From f177dc87ebafa082b3d322702a4a415fff71b319 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 442/465] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 87d9661a76bf8dd92d9618f46aa9648b3eb7215a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 443/465] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 92ed3d4e21db41d2476ee53cc6c32b937afa5ae8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 444/465] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 64e3b6bc896ad5d11b803768a570f2b22d7f53b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 445/465] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From cb39576e55164de1c4916eb0c06aaee132a17ed6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 446/465] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 003b89f3cfb5a42d0736780ae7b32ea36dee6cda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 447/465] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 0e46e3d45049e2fbcfabd2bdc4e360e974500d9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 448/465] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 9b65215e54ffb603eea5b209d9ff38f2147ed786 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 449/465] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From bbda5c175fb933343be45aa9db7d9b2e886f3f38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 450/465] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From ca1cb821a73d53ed53c8f00488d04af001718c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 451/465] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 40d6614ec91a39a5932d2b5dbaf61a2b20a108d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 452/465] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e9fc601a24cdc801ce95417067937e795339a6b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 453/465] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From cba32e11a3751aaf30d0e8ff4fbf05e11256bfb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 454/465] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From d4c13b8800cf25a874bf35570d94511afdfed4f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 455/465] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e5f54887c1882d7d58a416bebbec30d6f4b225c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 456/465] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 3f3c117838e5bd0b139188ce7bb5bed9cb9e8261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 457/465] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 79c6bc7c17d8800d202a1a915ecae27c2908e657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 458/465] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 46b40372abcd4feb296bc7c578027b8f3860e747 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 459/465] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From afaf514b7f0d90660d0d284d0a04775b3e8445a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 460/465] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 1970451f75ed38a9492f6e00bd8f51cf310a4fee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 461/465] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 9e14106d0c9b29183371044f9d506afe6c20ea87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 462/465] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From f40dfcaba4a2c5d754734c0bf05d302e1902507b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 463/465] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03851aff17e..f190ca65bcf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 3072c8660483aae5e4ac639774e7fef2f9a5ad03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 464/465] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f190ca65bcf..b9ef0c3adb7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -246,6 +246,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

From 323669240de038e311bd30da471ca0f128b13adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 465/465] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

TODO: News post

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 582833 bytes --]

From 9ffc670ea345b5de141ee7cc1231f2d5b400a596 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/466] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index d86b7eddef0..6a506eb4de8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3445,7 +3445,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 9507cc0abd5e7c55e863c76dcc39e0d13fcf3ddb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/466] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 92eda96cf88ddd0d816f3d3a3a2408d8603933b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/466] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 94dab44927e0c170b16d8809ec2d583a61c53d7f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/466] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From d53a0994b227dcf04514b27ece3c30ad4283a0bc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/466] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3e158880b13461403b4ca19adcc53ffdee93faf6 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/466] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 6a506eb4de8..54128395ea1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,6 +1759,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 6b1b2e0caa257ca838e3c3c0b767ceeb49169f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/466] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 54128395ea1..bc58ed6cc0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,8 +1759,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 590f93382e6f5037e0cf74e30d5ab9b98d073ac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/466] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 770592370e13224bfb3a0c4e3c91324695b31ef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/466] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 088a7dc72fcb61c8b2114cb94ad1dd0b965c38ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/466] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 23ebf04fa62529e2fa8f75854c5e978583f7b832 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/466] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 732399120e1f88892615fa8c81f94b7ad22ea77e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/466] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 7619ff613a676a5010608336c5a08a5fa51c637c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/466] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 7ff59441aedcd86a3a7096bdff91e5eb96fc8562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/466] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 05f51f63117fe2667a8afc8e0c8feeb6a68f6f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/466] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From fcce330be0ee5af15380201c57142ce2e83b8dbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/466] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From eb07628982c7fdca65c9f30ccde0c402cb69b619 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/466] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 4133c48e56da88964d0c7941e34fecaa704f880e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/466] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9e2db3183d1a36a4a42f0b2233f767dfe242a265 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/466] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From b8b779aa52d6cf8724ea7448157c9298b524e96b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/466] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 76e5ef7c4b6772c8ab5e2ab149dd624bac8af1cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/466] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b2d5f7e3febf206377183e909922a2af3d39ce30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/466] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 933186eb34cd2fce3e54273ca7b1055e22b506c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/466] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1b6759d98733054c4c387c727c299a5f020dcd7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/466] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From f4df61b74b0431090b8c35eb3b24afb0b607165a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/466] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From f80a4e41f5c21c0efc8a520e5add717def1a2b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/466] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From b201affa0986b1d78466f1cb6a922cb7008801db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/466] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From d6ee5ce3558902d65cfe61fdab12caae77128d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/466] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From ba55590956eb0077a50c255b473d12efd86155d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/466] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From bdcadeb84ef71ff2c7b12de4a620e01ed14b4cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/466] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From cc6a711659a25eb998ce784469c8e4471018b749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/466] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 673e63c18a751cd1bf8ddadc27733c7cea75fabc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/466] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a34239b569fc30a2249b947e3821fbe6ca9ecd70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/466] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 273b60c626ffa24ffc958015a9a93c783b5a054c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/466] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 33c52118980042d3013d3d05cc5befe05f5c3dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/466] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 2e4990a7e05615edec1b94f5df4cd500c7948b4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/466] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 60f251c1f1d9c859896fd0db180c87ad768ecef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/466] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 7e84df59951972ee21066eb8721daa2242cfec7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/466] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 465f25fb2fa12c0717984118c0c11f2eea22f3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/466] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 63f0a233b3ac052b306465f4d4fc16c5ec65b1a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/466] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 75ca17238c72d511a885d2017d6623802ac59699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/466] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b945d8b6726d29e48f02beec8ea5a9805db06e6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/466] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 8b1f88c8a5f4c5c2eeee499b77c30901a2718a96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/466] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 66aefe336031f09b96bf7efd8eee59e03def3a93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/466] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 75f52d0342867cec3d660d79ba5a822b0643f4d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/466] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From fdfec2909d775fba5307beda4be80bab11537fdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/466] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 670db905de75b0e99a205666ba52e6bc51d3497c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/466] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 6e16e4caaabfecae3b857ac48f5ba4a6d10799e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/466] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 04f90e4f322d42c5e301f29ae6215b1d27f58cea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/466] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From f6a6ed6bb76e731d1cf49c5d510237dd3f8c306f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/466] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 21d027962bf0a843a2b7220fedad20d91cf018cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/466] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 165e0b5898153fa2f3b6e3549c6964428cf42cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/466] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From b78f21b43e46670d673da7f02e5e0e0693478bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/466] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From e62fa7d7d59946ffeb7ee4c5f751c497d16fddec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/466] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 1d3908bc19fafc934d0435364f4460a7ab1f92c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/466] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From db75807d1672ed06e2ce1196dcb219403e8d0227 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/466] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 038e982aeca48a321162b0bada03d34941f4f98a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/466] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From a31b49d04ad4bd3fd9002c3cc212f11440b02671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/466] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 5860964cbad300208bf0db50dfd916f18bda9701 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/466] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From ed4d8bc66435fb828a2aeca43bbe416b41d40643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/466] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From cd060c923a424d5697876ed01031f22896103a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/466] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 56cfd17409fc5af80848f071435eab2ff367a2dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/466] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 657231b7bd601310b5ebc7433edb3b4313b13291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/466] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2fab7ef19eb5a6657eb98abcf6ee5ff359aecfc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/466] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 490a1140dfaca98a2137fbc4fe0abaf49bea8353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/466] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 594a90c5dd2d41a1d46b67eddc752cad0f95b8df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/466] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 11f6a6aa5370f381fa3e55715fafc0f2eb9ae2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/466] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From ba06ff3463cd90fe448d0f1502f219807dd68f15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/466] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From dc1d65e174859fc0a416637363ddf834b93b2fcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/466] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2c493824c037dabed34e680e3b0a931af86dea76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/466] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 0b7091457d7954f93445a2df24d55efebd7fff18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/466] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From a577ffe35ba0b3f963d1ac681caa4c2acf416331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/466] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 675f0af7987e04a5a779d612a886760c3772e36f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/466] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 7c6e80769de1540854b16378ef92c22acafba3dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/466] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 987cd3a6c05f87583c26030c52c1e74c369b7df3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/466] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 031f937941a2a6d37ed6d405276662e5286a829a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/466] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 7d70712ad92ac044965abcf40007903eb1d29b20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/466] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 1c188ea67b050948022b64252771802af3d16e25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/466] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 88c068843c06a7bcffc57db89ed5b386329f7e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/466] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 78400d3f97693a95749fddc9378644220134c652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/466] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From c2afc867c070ecdc718335cb7ce4764744b74da9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/466] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From a47e7005c2d2ee6004b43ff08c3ad5ce6b875ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/466] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From da7acd72457481e9cd6d261aa83cb692ef363993 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/466] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 20a6e0fdeff9d81c3df187835eba43d952ff067b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/466] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 2d19411311fee7ffd47082931bd3f3e3df0916e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/466] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From a2a4f393b733cbbd9ebd3db1331f2ee36292a89d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/466] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 0863c3866a860bf1226321202bc83c7a98c67ada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/466] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 62635411a26e87f7897a767f64a98aac214f2333 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/466] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 263e80e6a868b36b40dc8cdd60b679fd2c0e2d65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/466] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 090996b3473b3069fc4055c326b6c2fe9fb514c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/466] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From d7e40e60ae662738271f44628a74b557f0c6d523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/466] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 6de591c23de3f78638cf473fc232bae5e3975088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/466] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6fce095e68a9ace865d763287d2d007edaa77d90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/466] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 155bd619ddc14b9bacd839ab4b01b82898b1728e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/466] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e3036d6607bdf27987be7e5e85135e8dccafb663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/466] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 6399fd2305d85c1f9696a29bc0c7800bc51c7b45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/466] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 52675c046d901deb4a3d662b804903d8f561ad9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/466] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From f6bded433a238bc24fbb5d0606219ea245fd9ad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/466] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From cbf4dfd1ba4afa00323d94b74670aa4a11462ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/466] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e14039a49d7d38395297042a0e6bee47f041af0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/466] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From aff8d4f7754b83595c5821e48d9f08245c108853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/466] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 35e58b45d39522d5b5b7f9593b1a6ae788728631 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/466] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 81fddaf1efd5a3f8b146cb3536943715e8a973fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/466] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 78119c54e3a95bf8e7279003b5f0002b2cd5812b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/466] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 651b6fbd5d9c7951e16b6ca555db38e805059ade Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/466] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From f411905fd654af10d62b69721a04266ea7ec5b83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/466] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 45f78da5f7fbfbfe3f3124e5b7ce4ad47abf6f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/466] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From b21bee0029c43a74ebb1702f61046282fd8ad52d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/466] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 1535200f5f94dc646f15dec5dfa62a874b50772b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/466] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b9f445a0b67302982d59a0b78763546761d633f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/466] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From f4b25cbbd01e09403a1b0b0e13b38514fc098457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/466] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 371ca3c9e1fcd46d7f583513484fe83ebaa11815 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/466] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 53c3f2222f0764b1fffbef77cd8c42bbe5227e82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/466] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From f2b13b83c545961fe8bb821e5029af267146b760 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/466] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From f95cbe009945b93ad6dafd83b70a65ec84eb67e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/466] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From d0a7a9ef0b61e950fbd493540ebf232a4757883b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/466] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 3898c2017a726608439c87c1eebea657e8db1c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/466] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From f5d3769621a9dc05ca1f9093680a7fffa9b3737e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/466] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6cd18b5075774cce733644d713c4c5708284f849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/466] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 6b26cceb6ec37696dbf8d342846baa27d591f180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/466] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 62f7e4b7c410b68c978360db3c3bf82a87cd88b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/466] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From fbbc0c6f030631632db18c4201988441aa97265b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/466] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 84406b6e014933f7e2ea2199df750ce0a918df64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/466] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From d1c76ef704adc82f42852301c124ab38e487d038 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/466] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 4aaeb52575faa8031ba01024c97ef68bf7e039b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/466] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 16b5afbc82bf8aec65ab66f8a1f7ba89d5f1db48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/466] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 12c44a76d46866e2fbb6b69836e93c5c4884f59d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/466] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 95c243e8827cb73343b66ac0488777bbeea09c84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/466] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 014f662e3a11e49fb3ff7557ab5c326acf7b0672 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/466] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 93baf4813b4a88e3bd904858e484f8c98b67b8de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/466] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 98b2e1e74d82012c42d3932ecf6b7e289be47fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/466] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From b96401b5f712c906cd595a59ad65d62c0afc6280 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/466] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From e7fbb0a57169f67f48de34217177ef30b82d73cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/466] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 00b0556e1d1299163aa939da70e840a7417eb082 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/466] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 168705bac4584d6b200f5f78f8ff3690573b6f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/466] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From beeb80c42f22ea22c4236f700e4a0ebc584eb889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/466] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 39fc81cdab1be3cfe547b14894883304c60aa2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/466] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 3197cc06d66e2bc8151d6c96b562620b6ccb3e1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/466] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eb93f8b8e207c0e5c3b327810c798a8fbef2b55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/466] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 4e54511fe8586499589c30a8270a5b41a399019b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/466] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From b733921f5445612fc989f8d74a69261dea5b3fb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/466] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 713d03d1f003640b6a711dccef3b5b026c0c926c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/466] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
  libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 11cc86fd94bae75906e3a74984a7a06f226dfc07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/466] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 3871ad03bc521e711427f1b11c0471180c220f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/466] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 23c37d983f81173baa0fdd9655e88de8e22aac9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/466] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b6ce3f88cc1c772dc9b9b749801a89820f07df66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/466] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8eac1bae351785f7547530069eea19c6c22cd89e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/466] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From e4975d78fbdcbc06d28ceb5ed35fce865891abf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/466] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 3b5f0bf2eb2f99f7b1d5c0e633a98de146073dd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/466] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 0b86cc615a97c34d6387b8a5d6f0f962bfb32fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/466] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 07854a4f301faa3bf406be66c34523717776f3aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/466] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30f6a9f7eaa412eb395d7e0eb3ee526260d944b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/466] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From dbbcbd9a875b92afd57ec58b2f897c59e6becc49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/466] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 0b1abbbdc6dddee80b312769ff5cbf5c08d1bb9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/466] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From b5c823302b74e964060fec7448d60a6da0f9bc7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/466] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From e4a7d8f3254fcc5336b510ee3c53c4192f9e3386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/466] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 368431bcb7e2bbc36a1b545c49de0a19c1691558 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/466] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 69c2832c577dc52eac713b033ce2a416facdab15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/466] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 7f39b5b4f605000438de094ec8f897ec2affe773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/466] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 82d7bb5dd4c8a84ba06aca51ccc23517819ecee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/466] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c9e13cfd7e8bf530ab49d12a51d5576f25fde345 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/466] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a2bdd1c36dc..e9c2be9ea18 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.17
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 9b80293f6e6dd4e73e034c8d6e2d1b2e61f29c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 162/466] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From cc3614fe8186ac5112c12c934bd48a4a44405cf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/466] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6868bf6ae00556e07258fd6df6403c86be5b9076 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/466] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From fcbcaedb5d7fbbc1a69b280fb1a912761f8454c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 165/466] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 1576d68d4b8f9d757340843b973240dcdb42e611 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/466] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From e1c86492d882f3fdcee1abd98cbe5501e9d0e27b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 167/466] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From f9dffd82b71a2e206fb2aeeaae1cde3856755efd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/466] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 52ffbac19d21c0ecbee291a0f966dc544d004ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/466] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 7082a0a604a4d28d18823f9cee8b364ab77641c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/466] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 6c292027ee67311a6b0eb7fec1f43ac35ed6a7ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/466] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 73503673839ecd2b8b0b3459e2c84647d4eb6772 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/466] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From e79747867aa5e1a933f491bc7c7270363485f1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/466] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From b983f541f60a2f81b5455102421134cd9ecc3347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/466] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From c6af4ff0dd88aa445c6f75030653025ef1cdad80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 175/466] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 07c151f949332192cbfc29d513de76a4400df7c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 176/466] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 040bd33e9f65d06062f6a0f7ece0d697abc21b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/466] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From d4066a1857bac71112e04fe08d5e48b3cd66b304 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/466] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 76e64660465710448d66f67296cbd83785bea400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 179/466] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 4930c97455846e70687dda2e633a4083ded91f2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/466] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From bda2266959b33ec95f2cb4e22d927e2f8287626f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/466] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From f224bba479d717f397cbc23c33f8df59eebe88da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/466] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c2861569d767da689c57eb5b9f5f3deeb67d54a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 183/466] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9491dcf13b3130dfc85f3e08d22626c6720237f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/466] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 8c44c4594db2ff1b765df85cbef2af365b25675f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/466] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 03ba9a72b075c4ad72bf1835729bd8da583b027d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/466] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From b518cf4373e5be2deb17452af272b82a4180d300 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/466] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 31f8961705bf5852a8f32fb77cac1ad2ca981eaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/466] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 1d67222eb1da723940683d93d6e77e0b9114cfa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/466] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From b81d68206843176b05a07701720cd32c7caa2ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/466] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 7a9bb8d4070f860125e6aa82cd9fba8a624f9a4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/466] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 7045715f2b58769bfa294e0fd3b68367bd08465c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 192/466] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 8cc85b92ba172d7b318d1279ee5fbe5604bc0d2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/466] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From dbebc704cecc9a6abb1a46ad3c789227a532ce6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/466] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 08b971f1623ea9b50a048306ed987534ffef8f56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/466] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 600c7d884af7ac476382bd439c01a6523be4c733 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/466] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 68a582365ad569c5527ac8100a62bebd5dd8f2b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/466] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 32ff8ff76d1114f75fa68f1bcadbab0aa33f7969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/466] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 2541b090c57906fb891845114b3a847877b22d3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/466] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From b799801e67bf32adb2f6c90600dc2aa6301862c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/466] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From 3c776e58da55308e2445a89c2272d72436eb8bc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 201/466] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 580a002b7099d74218af37ea77fd56a8e9de3435 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/466] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0c41c64340b377a1d7ccae777336435436df6b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/466] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5add06d8264fbb39f5c1e882eee914f1a9776a8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/466] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 2762e285d4561ebd5352759f56ff48c12b9e68ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 205/466] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 08b67c8d701f43d8a78b502c6fb9c5bfbdee8c3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/466] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From a5c37d27e879c4dd5535b9db331905b8a7dc5a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/466] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From b5cc52a8ba9097edc764b978a07a24de78a6105d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/466] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 70fd39eb1b1cf990fe12690d07ac0a6dac3bdcf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/466] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From ee1efc28dd1e3109761def40d16e9484d32eb9e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/466] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From a2565081a2a28363102943185ac7422a130b9c37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/466] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 681cae2c0fca9887a314cb127fa922bc33032b60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/466] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 490b14eddff8315bb2f7a2e65f7d0432361256df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/466] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From c51e909036350af72e7f7ffcf873784bcdffbb22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 214/466] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 13894d1ff0c451335301d72719e05288789e765a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/466] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 1fd95594deb56a88a0ec0b7df87eadf0ceaa2f3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/466] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 31b3ced850769e9bb44a3f70497ce75d4404eee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/466] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From b73f060a9796e1b329a037479e5a79ac7878c402 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 218/466] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From dc4638603983a3a53ae3bf3f36ea21976a2f3edb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/466] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From ae7a8e2c7086f3e6c3a1f7ed48e13a0354b29eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/466] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 27cdee9a7faad6e412176341b954c9492ad34865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/466] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From fe995b17a621141144a3f0bbfce20b89b5bb9e32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/466] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 186c6ce7ca919674d5184e04a8c983d3b667f6a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/466] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From a2631de1d3da092774c20b65194217a1ea71c5d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/466] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 571b2aa1f3d022c83981f208b9f009589e9be136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/466] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 227743f6e9b8f54deade280c9187c91847915c46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/466] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From c4c51d092648e5b12c7409d5ac0467168aff9198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/466] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From eb19d7d858980c36cb5046c231c013c0e264550d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/466] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0e64dace4a8deee9104a4f2b90fda32bd55a9610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/466] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 815df5e8ff908679ec2cc410b5d412ffaade0310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/466] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 87f6eeec73fc458488be53629fea5dd15d0b4f99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/466] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 3dad6d4f0cc0fee3a1a1599cba44b79afffb4929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/466] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 8fb24a0ddb4f7a4f8029b1104b638452ab3b3409 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/466] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From aaafda4c19fb590551496ee1ad62d8776cdadfb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/466] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 0f232544568e96596427168661c1973632701b71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/466] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 41faedfbd2c3a82bb96a662c0b5f3129c65a1a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 236/466] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 3d63c0b4d1f9af9a1ec22e0e12da603f3be3bb60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 237/466] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 958fbb93a967bf9e0ce16163706a5b1bbfde6fa7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/466] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 6198d33ef543a4b35af3e7601dc7231672e3c41a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/466] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From ac5b0af5b012c6feb29cbdf2087728c35ac6749e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/466] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 559a7cd0419839699e079a405f079b36fc0d9fed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/466] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 402e135ff1b3acb361b1016857434dc38c12fc96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/466] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 80317265d3dcae3165fb4b47ac1a098eb2c0096d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 243/466] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 7f88891e0503aa3601bb3f1aeb67b18ebfa87daa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 244/466] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From b327667eee210ac08ada17852f2b253c16c984d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/466] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From d017a65f6a8ea5c08e8fc72b8034d2b5f7ce2dde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/466] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 652fbc3af1537956855bff72f8d33e2072a189ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 247/466] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From bc0715dc68816c981e41b2194ae25fcbc995a3a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/466] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 7c585188ab9511ef32024467d54910bd781969cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/466] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From eeb8faaffb74759fa0dc095950b511d4d0f22562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/466] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From d6ff8c1cdec0c1ec86d6acccfd388e534779992f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/466] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4495fde9d22881bcd011712c2c1c9843ccb70160 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/466] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 47e8282893ac1c533ce913498bcf766488f1437b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/466] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 30317ae0b649dbb75835833cd05ba21fca75910e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/466] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 3dacf79e6f1297be6f16e40681326b0af3c21449 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 255/466] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From a265cdb5cb9d9b0978b7471b547d351a199041b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 256/466] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 3be07fc623f0b5c788f17d3f559420d04d6cc99b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/466] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 310eb0d8801e1a2aac647409b98d56b873b4a5db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 258/466] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 265040bd5ac94a9683798943f81deb1fa5d6c315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 259/466] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 1b9baf3e6e0127114a1091e9106191717eb24c6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/466] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 58b0f3d9896164930e7a149d4ee275da85580694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/466] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From b35c0dc12a9cca7749b1bc55c27318a8d1c8b738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 262/466] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From cc40603dd37cd595f5a0f748385b8c3ff0f2e071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/466] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 256e53d8c6106e809a0f4f43319c362227d2eabf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/466] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From e6571f9ce66211e11947bbbbc36946707949a491 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 265/466] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 07eb359f1e358c6921235249e1d797000d3eedb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 266/466] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 1bf8e7241fb1b3d4c28a55361bd53dbcb333ec6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/466] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 0a9ecc398f94d81ce35ce980b3dfe6ea414d3eb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/466] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 824a35017c2445988f5609ff77c7f1dccb0e362d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/466] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From db6040ca4dc5852ea9ed9129aec696f97a9bf9b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/466] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 34939712a007ee872c21fa270b7994c72e70e892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/466] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From b3910db72ed9de5fa6dfc091bc687c8c6cc2375b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/466] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From c85d21fcea2ff336fb1c24126262762d3b4c3476 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/466] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 5ea2828e0a8b36a367acb0a1e9af14d29fa618c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/466] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 25ebac84944b42a1c3eb76234b41d40bde07411e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/466] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bfc13ea09247d674feb56e8866ac54b78750757a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/466] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 52d5e1dd4e636bc9198016af52d8f91be1cbfa20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/466] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 88a1f6be3138e056648125ce72949a5b788a9813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/466] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 8bfdf17b38dba97dd7760ac488a1437b940cfdb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 279/466] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 6b19a0b55a88540eda369c47b4079e370cc14718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/466] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 2ea77d0413ee1dd4edce3394b5133145c0ad1dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/466] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From fb413308109c242ccd7531d017e6c6660bc3b1d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/466] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 1d287e26a82c2a9359fab246de702c95faf1f141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 283/466] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 35107412db0dd29a6bf13809b6eaa900d15bb739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/466] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From d14001b8338d7687bd9530a48061326a458b540c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/466] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From b0756b68a2f0fa8cc5bbfd467d053b7c02e6a212 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/466] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 61b8bc74f98bd269548a7379ad9f8ff74c5e345f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/466] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 4cc345ab7c2b388bf64683367dba211db080edd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/466] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 35141ecad59bf27ab8d1fe6a6471e0f3d6a0872c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/466] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 2faae05dce11068d62ad46f1d5cda842f1f938eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/466] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 055cf2b03edb77c28ac0efe0752331e27ba91c02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 291/466] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From ea3686a69e21ce677d106899d7586bd0f29a4bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 292/466] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 1e24ab96302937b2b35a5927b01629009232e26d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/466] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From b1fe062cd7505492ad17bc652c390b725972ec8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 294/466] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From f0267a48da2ccf4161051d6f56391cea4d1521c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 295/466] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 7a84405c45298facee5f2d9be5b22da88f028142 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/466] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e531069587cf21fb88649058fb029dddfe330088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/466] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5b811dbaf93f5cb66ab4106ac92b5d559741ad52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/466] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From ba3fcb50ebe7b426b1d931763deafa4dec6a80fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/466] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 0052d0f8cbe2f76070a329dde4ee3094cd368e87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/466] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From bc9f68fb262df38aec78eef7f4b0304850abee14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/466] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From e2e8794627c77947f3d1ddb12ca0b480fe0604d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/466] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 4a885a13b344750b0e341916865f60a204c37f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 303/466] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From c32a2137178fffa5ce22b1a4c8a6d9239896eb2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/466] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 3d0e83815aa77f25c84d1c5fb4da8a259816f5d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/466] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d025e2a42255cc0cdf289196e4446f1ac3f69991 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/466] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From c84f7b5eeed71889191e9b6066c54d53ad43dc17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/466] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a620540e256b19dd1c5b82d8c8b611fdd5904f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/466] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 28c550f95e99e2fbdf56493fa6878db651d70ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/466] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 39b6c54363af6bfe2f06eb599234d9f1f8f4fdb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/466] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b5be7fe00da5db8ba619897b27544e26b496086c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/466] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From cdeae4b81f7c81700d7720e8a4bdce05aef99e30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 312/466] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ee13981eccca495ad9013099192831af40796e44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/466] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 17057d5b3a044b6ebe06c17ea7bbf480e39aeb13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/466] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6cbabe1811320993c12c5b16aa05a758ba400f75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/466] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 3ad3a4ba4cba51a467e6316ccdbcf345a131929a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 316/466] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From a3be1d1a25b192a682e8f2c470ffe6a364806bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/466] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From a1aae2de9b6820ff27d801a651710907e6f17983 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/466] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 60447735a071e69f93b8e9ab711d6776903e1992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/466] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From f67421d6a65e506c8b5d876456a2225dab3ab640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/466] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 82c645ebb0b044b5d839cba0e21ccc0cc07c5bdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/466] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 6d656201d1a21aa129c53a543b819a3d389f10cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/466] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 52ad5b2d7f00ae7d975e75601b49086a9a3ab12d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/466] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 38f54d3e8e51b8f8be38e02131c4204bb0a4d8e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/466] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 7bc77f489eeab5756c7bd71e7c092af37cce14f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 325/466] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 4c8d32077eeef0cd544c58e295a7127b17c32bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/466] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 21ec7471e8b6cc98662be6fe9665131c7e447bf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/466] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 74ec811264ad0e1b978b9269c552c8339d567eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 328/466] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From eeaa26c6ee375144ef77c8b3bed89f68f0856cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 329/466] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 0b450350d43e73caa993955d20e30e0221a42034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/466] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From c9761478627f9ea864b5272f5c5dcfd2a0536b3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/466] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..3c77879ff90 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.1
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From fe036a231b356f33aa663252bcea95fdceddcf2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/466] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 92bc46f63afe281ed010dc3bf02d62172bb6d376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/466] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 304cca18d4318748ff3311dba3586c2bb3102a8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/466] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 08073239222a7a49ca4908c1db9ce41805a744de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/466] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 96e8bfc4f5f1fa867397d0b0899dc35310b67129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/466] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 969f5e52c306f95d55546b723c1137d5a85d554b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 337/466] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From a6eb080f4bb82848523c7ce586b10987ac2dc94b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/466] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 6af9debb01c7228f672822e1ac6cbb3917f3d4f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/466] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From a3c78e2f283f0a5eccd76c8d74df3d710c52e1aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/466] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 43b951e3bed067654e184ee6af52506b60f6e82c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/466] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b69b5c0d42e438df2972b813f64a4c064586f376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/466] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 023dfc3dca45e8bddb8c24f4341303265114fa7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/466] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From cd10d7050f5f5fee66cfa6c473b63e415d60029b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/466] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 62327f6350e292f5940667329ae8a42e294439aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/466] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 563b1c767237a86ac45218451cc02100e7776753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 346/466] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From f0554b6acabbd9fd4b29d3404b66909e093986b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/466] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From ea9c7bb26b49f0fedf8b95e1ae3a4bc53a6c52a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/466] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 2dd05377f174d020db13511be860b9ed5feb02d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/466] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 77261ddc84b768e8f7e92a1d3cb80e75ffd85d66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 350/466] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 723bd05d3ea4091d11502746991159b8ebb4a563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/466] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From b0a72fd7124187ea9bb385a0b4cf411128f02376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/466] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From b494c8a06f4a250cfa08732ab5db2057029a3adf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 353/466] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 4064f2505ae54c31a70aa675be552dbc7671fe65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 354/466] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d97e8cbb586c8460702dd85d589e1e6d4488006d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 355/466] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 75a04e119868bddbf20f173500770bf6f4cf5e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 356/466] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From aae00be093176534144e168c78932add2b280c84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/466] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e5490f8cd2beadebd315d3beba0b1af0ed7909f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/466] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 1b29d288a42cd97fc0c28f12c1b62baaa1765946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/466] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2e93ca096e60ebf303fd96c5aa10629b9e97f0db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/466] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 0c9bac4fa54a047b7dd133c1a77f42b980700c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/466] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 6561830d03d3bc1e6a91cf828d96ad266a33478b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/466] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 5b2199a37f3dd4c37984e9b7af915166f6fcf5e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/466] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 99b94bc06780e69dc4d33b80d9a7a8a479ede74f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 3badc4ca67934dbbce94d896d5c59ea0159e9b37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/466] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From d33febeb9c0f072cf4dafd676c025d6d2bf80c5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/466] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From f0ea38e985be08b8917fed91f765232cd9c9c29b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/466] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 462a3951903bec0ad0f4ffa32901f66d818c0845 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/466] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From d62db917527be56e81d08a17e1cf67d90b02a500 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/466] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b6fc946860e5e422965035303af26098e98f7bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/466] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 473f3ecc32d2ceb96b43385104660a1b602673a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/466] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 3e57873a543d243f615083fb0801dad3881b09d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/466] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From b403b8894082438ded7997a5d2bb5bb12e75838b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/466] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 46241ce5abe9696ea483b40b1ee084ec31b9ca70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/466] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4859b130f13ad43211862f10eefd33745fb741d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 375/466] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a90a66b8ae2c9d174aba7a2da0718a5473863486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 376/466] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From a770b5bf048f33b3ab87c6f0521fc75fce28cd8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 377/466] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From c5f565a3e6cd03dcf614db3e1d0f95cfd7a0899f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 378/466] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 799a6b2181241bff98c4971eccdc93a4e3aa9784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 379/466] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From e702af218d3bcfa112912d8e912f00c8cb264bee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 380/466] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 689c6c99a93bf6e23c7a4956d18eb697142b393d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 381/466] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5218ad068de022cc50964b40aecabd00cd6250de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 382/466] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 1f37e3f46fa9a611fc33434817cb3c487c93a0c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 383/466] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b2448638512a52b56d3287b0ae7708e28bbe1be3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 384/466] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 0779026b3c42f6620a622b7ffa2067dae591f224 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 385/466] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 8f8dbad4694850fce0feefe8235583cafc698969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 386/466] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From c8beb0961786cd840a1731572c3a4b31da5d9369 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 387/466] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From c78d5efc1b4fa7630c86287799fd543b2b1ab90c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 388/466] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 3a21ed6e792bd557b75386f7acd55f9cbf9fd4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 389/466] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From a57d886428f52448621502f12780fd12b88ef693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 390/466] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 18a2abc40ddf1840d8682fc1106da9cde45f748d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 391/466] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 79035e7a7a54d7767a735d9f294689676601ba0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 392/466] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From aa512838b0e922defc85d0fc8b90c0a3ef878496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 393/466] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 6827d43be3dd6ce1b5771a1dc9a0854c6b447fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 394/466] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 1d4f9438e4352f0f4a972a14acd8b381f1793492 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 395/466] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From f819650ccb8ffd544f6184f1c3c1903d59ea2d41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 396/466] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From ae0eb9ebbf215c7d65ddc6067540fb204f21a1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 397/466] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From d71793283ca9fe09c20bb30dd84098bff9fcdda3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 398/466] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 0f606471fca90aacbb429c7ce145a42ab0969f30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 399/466] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From e8c61d5b55afc38773b48c90c84c89c2fa449383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 400/466] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 70c2ded85f1993cb088140a1a39fa7d95f5cdb52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 401/466] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 698e8a97b62e65f481f0fd88a0dc6a5570bf76b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 402/466] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a395db87e780a4b3982052b5e8e511fbd8a0de6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 403/466] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a2eb7e3c5d76f488c5a0409cefd2ea08b12e0439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 404/466] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From f18431c4ff6e22cf4daae9192ad27e8adbd994eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 405/466] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 63f7e84583c8f6ece200945205b45bba871a6569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 406/466] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From c00b6967d96253ae1c20f50295bc28ac879ec531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 407/466] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 8bf0fb7daac07eb99b50d3f9a34893a04825fc48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 408/466] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 1ebd664747624a70de5f28f2b712275567c02782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 409/466] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 1a225d276946c0ee790d6ca207e6882fb2d58a4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 410/466] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 97991318ff085cad91ba87dab405f4ec0995da5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 411/466] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 6a685415effccf2ef77095dc02873d452c8e216b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 412/466] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e3b3687b87d6cce4fdbb2c52066101b7035618c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 413/466] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 9a75202a235365b3636c1a4d1b2b7621949191eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 414/466] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 19006807f0fddda1dafd2a6eeae32d99a62f354b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 415/466] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 90ea238d7283c2afb70375294f5982d731ecfbd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 416/466] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From d53ba0d603d57bce79ad147ae6858b7d96570006 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 417/466] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e920dcbfbe3db9bb61841c1cf7bba288d6f60fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 418/466] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 939b460b897c305a41be2a0883c87458cb3e8346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 419/466] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From a38e24d5df871f9aa122724a2b502ef8e803dd4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 420/466] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 4be07addf7683d605886d9f2e463a2007d83ecd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 421/466] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From e5bac5494913c5162063a84a3fa8a8a7dd62541e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 422/466] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 17dc69afb3ff525889debeb742d649b76974f37d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 423/466] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From afa21e4afbf387f60b6a2b1ebf7f9a8f73e49ee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 424/466] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 1701ec595986b7548502dfca98de92c02108ad1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 425/466] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 0369665a4c11869229ddd27d6a149a0c0ea4a00f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 426/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 4f56e47a8aac29ba5bb148de27e28bb6d6722d1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 427/466] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 80a06c9d84fe5bbd68d8c1effcf5ad1298c0f9d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 428/466] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 6ccb4959d103aa9928966c9f8c88025fb7bb2e7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 429/466] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From d40151ae448d3339db4e2fdc62272dbdd0a22dd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 430/466] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 1a16a996d8ac1f0f13555bb30ab08ecfd54c299d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 431/466] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From a45e796d401e2b3e255de182ba407b396df732c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 432/466] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 9d73c2e09bf1c9fd42fb6487ec12c3eb5ea68d03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 433/466] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 1a5ea0a609ac23c184dc24c3a3e6f776fe1d979a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 434/466] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 58c8f76b79b80245f771b8cdd070409356fa76d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 435/466] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 06cf0a78b860394d60d51756519a6c91acb3fb15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 436/466] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 56857f82406bdb372dfa12b1b468bcf3eeaf293e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 437/466] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 4a88435c72e5227de244d4ecc00ff1c53c5f3f2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 438/466] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From ead020b04ea1453124e19bb36f4e952a531d8985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 439/466] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 6a87465b3dc6e9afd8c70c4a047c4591b312127b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 440/466] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 427b6ebd2d637598ae8b39db9015781636179792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 441/466] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 48df195e45299dc08a45ccf7bb8a948dd8b229b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 442/466] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From d6cca3283544a2e6c84eb441ed0e71441b13c689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 443/466] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 8f54371c3ecbe984284b96ffdb184a6a04150aa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 444/466] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 961afc360ec0106471a9a2f2e680c512ec627504 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 445/466] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 54e124fe0bc7c7ab580272d025ef2be1070379f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 446/466] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From d5eb2e22c6498cfececef155015d281e5d2ac85c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 447/466] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From ee097d7418d8597996d10d754978e7c6250df875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 448/466] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From c941821d18f9c69ea6a9912b7e0883f7d7f8e2a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 449/466] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 8a3e4bddd68e187a782c4412ba81ef2b83071989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 450/466] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From eef2286b145bca6230125b36ea3afa02810f4824 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 451/466] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From e5417bb038c378c13f528e577fe1f73ef31046d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 452/466] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 31ae8a974d7f487cbe86d48778c6566b0da5c280 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 453/466] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From d34e629b75d329b4ed440a4d08af71e82a31fb47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 454/466] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 6b9cc5023d14df8d80dd418770aef1bd69904f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 455/466] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 94e28310ce97b10d7136b6ad136b650136b10a20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 456/466] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 530289f8b2164c51ae2a1ea714dd8cce93c7c55e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 457/466] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 1d6bc529d3e5cd8eed5982816de02a93f8684d41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 458/466] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From f31601d7836cb8dd96e89730c3cf99a7cb4c0a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 459/466] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 2f584441657d1707074afa3dc1928a613b0eb523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 460/466] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 0dd1b2dfb59bd0389b428481aad2047f7d3608f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 461/466] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From f50366123c7499e12b0d7cebc22df42108e084b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 462/466] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From b69970ed11a037fdf972c9d30c9a576ace366a93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 463/466] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03851aff17e..f190ca65bcf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  arm-mem-git<=20131108_2

From 4d1e8435a6b311be718721b7c8ff6cc62e72014e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 464/466] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  3 +-
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f190ca65bcf..b9ef0c3adb7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -246,6 +246,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

From db734c4e32a90bf2af29055a9544c38185efb5b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 465/466] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From 2423781d266407ca7fd1d237a8c355134fa1f709 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 466/466] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 582599 bytes --]

From 0bfd43bb2a8026c410c67142700c76f3a0205c01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/466] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 89aa301681f..e3cbd4caaea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3445,7 +3445,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 70c92bb71fb2c598f75c851d9c0be0169a5b427a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/466] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From d4e2a025506d9524c5cc45b6b0895dd593b609c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/466] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 5548aa6f98d1ee4d97a2dfe962d89a37c50b9206 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/466] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From a84582bb1cdb148d12905a1515a2582272f0f6a9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/466] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 25fb44b8eebd5a363caba63ae51685d6d5bdd56c Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/466] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index e3cbd4caaea..1f1c305b9a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,6 +1759,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 10c748dfdef8f91c4e1050ca1facaf22e35d56a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/466] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 1f1c305b9a1..8d0d72d224e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1759,8 +1759,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From f874712cbedb8f2678c0ed0bf747bdf664fed835 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/466] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 715f46f6830cf2afbbbc9524258f486dadae71b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/466] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 134b5d6a74d8790a36ab2241624a0075588133b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/466] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 43ee82e8e25c974b02514921c69b8bc7f09f59ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/466] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 93fbe4428849478aeae4369ea0e6babae5f99693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/466] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 49d4da57fc060657099d12f760d4dcfccf326b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/466] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 97c5a83c76f75990fc037e7373b1988a9ffceca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/466] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 46e754c93c72108bb7414a8e6821cb66136918aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/466] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From b06d536cedfedde9e2975b982f89d1021e5bbcba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/466] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From d713bf6cb5c736135339e5ab8795f8e1330516b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/466] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From df2e3798caab7b16df1c98df5cbaad789115f7e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/466] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d21a0ca9f5d28b6409616cc9af3a5ce29b356b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/466] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 4943cd45257697045c9bd30d2f80eae69fd40c1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/466] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 2f9c14e8d5c8ff8fa462c0e1caa0fe7989eebfa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/466] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 70d4565ebe4156c9315c6f08d0c0c281c138f7c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/466] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 9c1592eecac65110a8d57859836af94742737c15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/466] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5b55e1548d5ea34b82c6ea36a0a9375921617ca6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/466] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 87d9a41781656f821b80403e26cbd4672bde32ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/466] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 0028e4d64661bccf950faa810ae6e8ae272640fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/466] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 18101c8f2c4d2ffa0069e5340f6eed292486667e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/466] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 1c81bb6c0c0cd4f0dfcd161ce3d79531b7acf6a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/466] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 00edd6ae59f5a48d00f03f542578f73ac651bd69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/466] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 5c341258d82b6ffafbd24f20f529f5e53760889b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/466] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From fd912c1a8725e2b5665250961488d390daee70eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/466] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 27ad85c59a2477bb1d53d0ed391d2cbf577e0b5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/466] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From bf56bd9aeb21bcee758f2a0b8d288aebf399d66b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/466] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From a51716618fbc2a4087f880f3b69286a6ef01a068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/466] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From e04575c03352fb66a5e1819131c59643ab87cbf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/466] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 93bebe89c6f08b3deeca0ccf2714b301aa00c3cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/466] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 365ee3eeee116b32195a3743e691c91abaad1f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/466] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 0b1458e64a45d6014df8a7184e15ce38b0b63158 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/466] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0f2ceb2edb9bed94a4708ce4d64e3b422a8e7e72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/466] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 6d094161ec6081d5e528b86fe51b65a5ed675a98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/466] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ec031adb9eb0e03e27b5f4af0f9b709944feb75d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/466] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 61f36eac47751db15028752c1ab06b3b9458611f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/466] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0be1edc1c92f6b9c74fac1713e848cad9a91f43e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/466] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 31eee10889a54d26301b4e493ac6ac9052b773c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/466] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 021dbd939b8d82d6c457b4df793669ee6369b48e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/466] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 765169441c57d2fcc9dbba28b785f0770bd430c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/466] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From ca2b2b23aca403199c83ce0608797fc85f70424c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/466] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 3fd6e5fd9a50493f8fa1465835f907355dee0159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/466] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From c46867a4208ce0803580ffc52dab3460aec6bdc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/466] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 46d2003c464a587d9971d57321017f80077d1802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/466] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 8cceb013bc210703cb98502f8a480ef7946c8649 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/466] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 56e3590ed707ef99d33ed7481bf77447b5a466d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/466] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 8a2afe1a36d1ba335ad6ce7892d66bf62285932d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/466] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 1614b20b0cd10be4ec58e6064b2fe422114ec709 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/466] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From e276f547f98594932c832eb6b02ac951b71cde88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/466] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From a1108a5f8cd94043704d5b42d6c4a66c81cb0faf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/466] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 143bbd7690a4c9cdc9fdcd4abdbbe0a9bb9282e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/466] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2bd179645408074d20180f6ba98458655d5fad0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/466] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 9b1dac2caceec1b7bc5d5830d329de927e12195b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/466] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 3ef69c20e587a3804ef9f74e1dd187ec63d0de51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/466] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 9815beea1c6d450df11a00ce2ccc34ace8c69ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/466] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 19c6c4a0215ba819d2d5a4a66c5a8230f76d7db3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/466] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From b52e93b7e4e6066289c2de25ed9464e4ba82eefb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/466] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 5fb68d669e408e5da66a61af560085bd413e52fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/466] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 7de6e4e42f0076bccf7fbaa05c0bb3ef7ccea51b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/466] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From e11098ae58f695eb146cd33b8721db9cf99836d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/466] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 4fbdcc2ba0b06402a5dd4e873ce82036917dd072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/466] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 921aacad08bef8c37d5b278c4867dbe35aaef1f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/466] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 6cb750704fedf264bb59c9d41925fbef9e85990a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/466] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05846584f1715d9da11926da34e9aab3bd00e76d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/466] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 44d92d38f0edaedf7b2d5152212eb997d7ee63ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/466] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 64c0923dcfea97cfb97597056edc81809f1f2940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/466] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From f9a851d5efbd58fcc50f20895b2c8a66e951fad2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/466] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 9ad48708eba2cb09e2a9c115ed842fa1cba46b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/466] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 496fce6471627ef237def1a14ebe5f25ffad6b09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/466] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 4ced44f4bc5729f4fb5b6fe2a9f80a6b16af2789 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/466] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 78db4c79b121e623b4d313ceb23e7e99ae59fa7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/466] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2870b8b1145be1614996149884729eb3d98bd47b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/466] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 5548cf8e226929870c842ca9e7d38cb783d272ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/466] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 1fc04a2b87620b12f4ff4e85ece968907ff1dfa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/466] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 3f960bb83ac8b6c6d4089b6194bc8bcb16282472 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/466] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From e691158f9bdfd2c9a756c515d1c3b89c9a3c9faa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/466] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 6aaf7c1189a6427b6a7d0e487dae3a44433f7301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/466] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From e6d9f2dca2f25f83921e5f7f689078bd14f0ce07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/466] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From c58ea5cf95efe1e2841d8d43ced01457fe35b00e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/466] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 58e452f86349cbd8d22dfa23b3b857208eda355b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/466] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 9563db81ff8a08ceb2a51cfdbf801ee9c5a84747 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/466] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 892dc96ed414a4deed66a9f7b7e56006219faec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/466] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b6cc4cb4cd8c8db956bf701066af1beaa3b82ccb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/466] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From c9ef160938e3c9dee34942e143def8537433968a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/466] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From cf69ab3d3081e56223d65651d63b7cfffa8e6c5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/466] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 64e14e6e97523d351337f48535a81eeb6c9a54c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/466] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From db08ba4bd345a9bcb7e4b56b7d7adbc57694440c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/466] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 46a85e6bd62872a7a9d5f5a01deea7df6f63554f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/466] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f4fea6cff1fa83dc419af8f74952a6d66b36ed2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/466] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 53b2fd5ca1a90cef88bb89ffa39cb0de2f4dffd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/466] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From fcd444f551abc2e46100a48fe30d632b9a6576a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/466] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From f8466efbee44ac2e289c282854d0d74070ae7448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/466] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From c96842fa887f82ae3666b5fac452b857edf25783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/466] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From aa85ae8598cbd0fc4879bcb6d26c34902d62e33a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/466] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From e3da36571a848adbedca9834a50109e0213a3020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/466] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 3ec35a0b35df3edbbfde7ff7cc038d13845c1d6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/466] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From daf6001f986b1b5fc7c90c9f062f5bc463c15e94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/466] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From c26a9846a22b3edb8e3b78e9db3a718b57a87296 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/466] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c2e597ecbaf5cb0b81f34b012652eae9890ba676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/466] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From c64527d1fd9cdc94b546948f3b526944b13896f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/466] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From d1e2379de691f579761a36922345adf974edf143 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/466] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 3d839151054a8ec915e915e93b68de84251ad7b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/466] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From c3b2194011f3327e6ba1c660114346f5909529f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/466] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7f4a14dfbbcef29333f7a504311ac1727eb01605 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/466] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From da88380a0c92920f0767ed153b9e702c6c396c4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/466] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From fa92f595a817184814b3a6c3d239f9ac8bde9a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/466] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 337c9c3c97928de1da4aeadea9f267202b4ff69f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/466] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 53777cc3f2a241750d69fc02699586f05c0eb827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/466] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 76c0a0c18474aff5ae4e6db3cf670202d10e5f13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/466] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From c13a8733274c409c0060c625f4fce7bed53739d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/466] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 3bb99026336019e814445d852c0241557c3f7ffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/466] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From a2c7cfb175cd7a6255460ea1c14d181451d627af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/466] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f7f319c60a262a30292bf64a66348c879c53cefd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/466] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From bb92f50434a0b4763af31a606c5cd804949eabf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/466] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 87bf5aecdf026cd18421fba133c82035f5f704cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/466] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 393bc6a0a417f6a258bdba7fddf492928dbae336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/466] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 721548a5556d764d656fa90150e113a37f87ba16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/466] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From da4b07c012e073b2df9a48b5e54694b5e3ce2384 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/466] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 0f466133a591c64fc03dcd13f84be93f6ec98f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/466] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 62f79421bf49382d2c75034d164ce161413a11f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/466] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From bce9e27fbbf838ff9b2ee1292fe2a0741a6ba763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/466] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c42e45443fd85e8e1058d6932b38939d68805a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/466] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 116d010e9cd59370ea23e91f95f86b818bfa239c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/466] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b6f5b2e5cc9ea6af8280c0ec6af672aaec888046 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/466] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 9153e00cb7ba68f5e783009193448b56cbbebf45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/466] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 59fa345c6ea1b7e3f0e5036a26337bedf028d39a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/466] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From ecb7963188ed0324a65c0d8896b0e3213906b643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/466] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9155bb3b1f463669c432a8dda614d693cfda762e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/466] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b249eef25e8df4d2e68145450734ba6010010abc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/466] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From c43f487e06fa91fe26a7d812d58873e02f530957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/466] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From ec748f36258d3d8d6d0497a106e0a2ec516efbf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/466] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 27bd90586b76adad735e76e4de8057ee17f1d55b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/466] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30aa30463e5144b9feb44f4c9ac19ade2878cb69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/466] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From ab5a2e080fb781cb293adc641ac70673f27e318f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/466] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 1dad7162854c2016ef77b6b71ee4b9929843f624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/466] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 3eff0bd61a828e00888fd57fd08e1e330ca68d89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/466] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 98605d1dd38cddd13d8f270636827cae7ea4026a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/466] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 0db62afa8db59c62c6e33c9b21ec9962cc4774e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/466] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 05e0c9ea1b6e6b57353e775b44dd4cf76819cb91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/466] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 64b20cec76a581351b9df3d7fbdfad81fa4449ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/466] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f37c9b8ebaf08edb059cdc56085de58dd3d2ca73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/466] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From e376e0608646f55b0aeb9cc032c1995a1325c31d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/466] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From fe704de3b029d14144566052bfa3a07c144fe323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/466] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From fe0160d7f8657e622f50a003ddfe498f0100ea5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/466] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 88773fe085040aafbd16351c7d9ee21b3258e340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/466] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 934881d0f55e31e12c74b0d322ca16c2a12c7308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/466] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 62d00b67091735d0415498bc79a9c334b9c9dc89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/466] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 63d4d5f1aa738dd4771d5af4c70ce7bea8cdf455 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/466] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 867c5291f54b14eb015263c846586ceda0183d25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/466] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c71df0697ed702dbaacdaa7bb85835ab13680be9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/466] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From a8060563b8245072bb1f134ce41e46e4e642ba4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/466] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From dfd0e2eb06f17856d38d43a9e0fb27ca5ab10093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/466] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From fde531f876d3657a24d322f7e81f67cba44094b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 159/466] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From edd6ac8a3b09df8409eb9ae40900e093f2689b36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/466] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 03c36d360346a8a399d75305422f135a25eee81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 161/466] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 8841fcdd09c6775ad87b741bb3098c399c0ab994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 162/466] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 53fd25de1da5aac4b594c2605771521c76f56261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/466] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 98b066b52a6a353a67e1fc7645ce324a22f404c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/466] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 506793d5fe6d59ac00be0f4f687cb9906cb5b6ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/466] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From b12841c349e0a7f5d0932930c7e25bb80e2acbd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 166/466] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 5ada8a669767ec4af280e1246ba06e9649061b98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/466] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From ccfcde0b7a8045c885cb3ba0f48db99cfd4de3ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/466] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 5d672a10f67065d9181890a8ff909e7aa52f795a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/466] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From b6a2885b149b40f95985b3260663c2bfba5077fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/466] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From d77fb1d2c5a489e34b4b6851dc15e1b7fb96d52c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 171/466] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 0394556aab6111d5e3b169009e10d5294b407c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/466] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 42eb175434fc704de82136fe37a5e1bde407326c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/466] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 42b2e7ccc93c88129da7f228f7cec5e498287d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 174/466] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 7301c01920e67a48e560a3ddc2902d444ce1f7fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/466] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From ce78da2c3cf7ccc0e234ab7a62af99907fdf034d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/466] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From bf20fa8fdfa27a3511c4da6eeb41189e324c6710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/466] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From e65b046fcc94027ec8fdbd73d611de33a2e953fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 178/466] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 3936ec85a3336559c188cf3cacc1bebfdf65f864 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/466] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0946a5cea1562e1e5266f16d7739b8a60517542a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/466] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From e8febdc645e037eac7cfdf283e141de045144eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/466] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 455c62ce6024979546b31e98c508880ef2e8a6e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 182/466] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 99766d58da3f9b492a203c7028d9672f98eef86e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/466] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From f442c3b58cc0c798cf77aadc14188bb9bbbce71e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/466] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From dd041a03a26d6b7f04c8a710e03ede90abc91faa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/466] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 124aab11cab282a784dd6307c3bf03f792cc688a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/466] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 178a3dd95e47ba1a1b2852fab56c1999c77d6103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 187/466] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From d3155a03a60550dd927558e7b360c2393fa04c09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/466] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 279ddf4f8e30202c26f29eb801d39ff1dd100453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/466] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 42b1411875f652647f90b2c449b9abbdb0399ef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/466] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 50796ba7bfc752b58f978f8e6e245ba4b3758da3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 191/466] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 1b06c20ea396266105d62c254fe679faa6aa8c36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/466] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From b6f8b1aa6c126224db7059b126609b929a29647f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/466] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From d8c701bf30c572d089acfaf29aace67bde0b4639 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/466] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 51c45097958e7324bb8db39123a726c8ea0cf7b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/466] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From d3feb0baf2538fc0840e510279311da6ccfdb171 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 196/466] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From e1a331de1a2496c8afec469ff99b2969d914881e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/466] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 27ad425a2857afba3e4eae857caeb584fa7ff8c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/466] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 21700a046220bfead6296e6215f9553120d50328 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/466] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 24eb8992a19d3251b402e2d212a574f436a40b06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 200/466] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 9f7e6a16b64da936b8def2f2fd50d8feffb8c3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/466] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From f8353dba419957772e0382bfe07c6a8605a974f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/466] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 1ab944e0fb465140e745175f02e87814cacbd784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/466] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From d1df76b4a08c76b6bcb5230eec88a8996581641d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 204/466] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From f13a9779bfd856ade8c5fe2ef77f3d691efcd25b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/466] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 1e402994274831094d668311dcc647c913c2b775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/466] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b156c4e5f1464b8515694442a54019744c0c384e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/466] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 90dd009c666b404fc0cb7f7a8fad92e4d67cccfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/466] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 16146b63f561598881216dc02e3bb7280b8d39d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 209/466] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 9f0e1083a12574c743238759c5365e624c0935df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/466] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2617676c1b7d5ffbe1a363b841da58ac6a27e63a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/466] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From a98d043f299bc08fcdba2f874290554dc3eb00b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/466] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d3c51ef27d133d6d9be7be54e84e3d681f91b3e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 213/466] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From d24988136513e059a6777a78cd57a9c46bfc0997 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/466] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 6a524dba416fb4117f64ad0351ab3bc1afecaf00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/466] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 883a5f7f68a668ed5aa27088be10b0961935ee39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/466] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 82347e1fd988db78523ff29590455b6c9bbc7871 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 217/466] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 10fe4163eb78d6e7eaf7b88200b0390803b29aa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/466] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From edb8115f75ad9ca17259f466a5ac94b32b6f92de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/466] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 2401a5562307939909efbb972c9155ac0a6b73e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/466] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From e69128de97cf6cb4e0df9b86e4c838fce7de4d02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/466] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From d002b47b97fb4ae658f76127444ed56e95b3c490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 222/466] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From ec0af37c24420ec194f6f8b010195ab65d797779 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/466] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From fff6d15fad78893e0e766d4da325d5398698640d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/466] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 69b99b55facf5430002618a2cf9958ebd2b312f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/466] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 497c5d8c513820ff782df805ce313e4a1fd300e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/466] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From fecf659a82ffc1fecf39f6d67b46dbcc6d311f7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 227/466] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From f370357cd3efb9b86dde827c797e7d5c6d75f370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/466] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 40c7dd9df4565877bf9948d053a83742fd6618ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/466] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From a75694770f965526128560d71b66d0524ff81241 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/466] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 9f86c09aee50f99735d85451d39188fab63abf67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/466] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From c30d1221ee1f8dd7bcd75ca177ae65878219071b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 232/466] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 2ac075408f010d5ac32ce2651317817ef3fef0c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/466] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 96d2a0a6235d9cd5bb6240841a71ae6e627f605c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 234/466] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 1943b95e62621e53efd7b8f8426e06e2ae2618af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/466] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From f15b85e7bb2d84684f5ef2850788bf3c2d2be5e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/466] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 7bba485bde0c1e2208860bfdfdf26bf9640fc4cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/466] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From bfeb31f9a98a24dd2ce259e2dbe0676ed872089c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/466] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From a794305c989c77aa821196e0d8be938e79338706 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 239/466] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 7f2bd2fb6036f86f40c5978e00128e295c3ade4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/466] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 78f66883100f34be9edf934409fe5666b9b836f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/466] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From e68777ba2214950e04b754f911156446264545e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 242/466] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c6ef913fa502d0b1145a8a8319718887cd4c7e3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/466] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From d68537ebb948222eafa2c30d09babd0a245da9c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/466] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 0bc9d888e13bc979eb0fd918119603c236ea772b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/466] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From a38e3d66e8a100c884e7f7dec9f4a3920e53fbb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 246/466] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 2b96b39648de823766578840f10dfb97034b080c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/466] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0e496d19c97fb5a3d6565a1a40f47ccbfcc8ec47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/466] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From a6bfe2783901827fcc74972f41579731736e0566 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/466] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From f69bd23eba2f6988a31280fe19a75e7b4b9984ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/466] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 64b358103eed341b10ec6ffb0c0a0ee79d198e0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 251/466] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From be1748b59c2a481dfa3b19bd942c3a520aaebc52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/466] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From e7f682f75e50e4574b9e7d4fe33bd55d09955b6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/466] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 390cd585e1168ca56705204c5eccbaf27dd706df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 254/466] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From a053f3642f3362268d55cb8193d5e7967a585ef7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/466] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 4170262a801d65d9c012c9bb065d478955f03408 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/466] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From c7562d4e968cceaa13e5d169f1b8aaff484bffc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 257/466] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 9d231aba4f59fe6be2ac6ec17e3218c5c55dfc18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/466] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 4d0b3ed39992aefb6b54f10d90ef2714d937c4da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/466] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 3e4b0677d1ae204bdc966cb8759ba6334beb1f79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/466] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 2c76dd9fb052b43909765d8b1ec0f4fb8d627d11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 261/466] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 5a0fbd11be43de312dcff7a70c4909ba7f45dac1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/466] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 255acc6e5986720fcb5eaebf3e37947ec0b19029 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/466] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 3b804f76f2f3e830b4a2832a2d378ac223c40737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 264/466] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 0573a1240390911f1fe865aa79621a65cda71a22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/466] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From d1614caed09be0d04ea3324606b69332f5b5cccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/466] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 976782f543e8097a7ba04bceb38d0e0a09f6d201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/466] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From fb286861341bcc618b3cf3fa2cf3dd193fbb6cf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/466] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 1b402cb22dd2b0e6d3e71425862afbc30c7d1ef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 269/466] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From ab4a0482b46303eb20717d8929bc88b7467740f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/466] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 7a31ccc520e6ad4cee5b9c4c94f433fb230b566d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/466] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2a186dc3bb70c8da57cf5dd5f1580538a66fec7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/466] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 5b545ad50df8fee73c44fdab01711993582812ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/466] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 25a1a1c0faaf78810d2d8ae52e3c33dd7c6090d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 274/466] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 95bb8c0f6aa8401095bf8ec4bba4b8588708223e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/466] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 03ee2b5144723919f3844023e64e13da1d821f64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/466] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 605331b707f30c558186dbd4b1a4ecdfa42ef8f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/466] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From e48917b821459632cf8da7743a80a9732b66b967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 278/466] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 34c37c2b9ad08019d81b9351dc064a22ae66ae85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/466] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 21b03bac9a1416f8a9c4e35b7854f869e1aa2cc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/466] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From df18f9b14f1c1735ffa3a568d829a4ecd88e25ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/466] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f9f3a8ca2c9e50d4e7f6aee0a478209de29a30d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 282/466] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From dba52ed95e92e8623d80a5d1325b3084e3087261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/466] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 923b2e1fbb7df7fe653759993fbc615d880c4f7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/466] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 9b7533db922100488d4540f8b76b0f92d3d80ab6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/466] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 5a3d341bf99803af328ee15f95f4d79b77f88251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/466] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From bf96091c1ea07ae921ff857501a6a7c551f29892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 287/466] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 5408790fa792573ff1a9fd7850bfc58c3440af37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/466] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From c17f8d332acc46f37a9a05bc894ab785aafe363c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/466] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From f993dd893d7740dfc9deb21eb20634cbfb9b2f7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 290/466] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From e42919290a5c8fce181d024bd52a9d7b3c4e5e6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/466] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 0f7f296ffd90f10859129f581b04a43a9169c2f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/466] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ca49d01d1c07125cd770d6423c738c93a7aafa7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 293/466] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From dcdff75a514c078fc6e40e116c2f1390a26d7a5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/466] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From b0b5836b0e47ca1176115d1d142a51e734dc55e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/466] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 65abd5b8df5bb9fd8620e524e2b87052761d28e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/466] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 2e7986247795e11774097ce7c179eca4bf2f5a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/466] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From b8abb1421cf0928909788cddd924860dd825aac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 298/466] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From e69b89ec14e5013ee9f7ddbe4a45d9bad48eae58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/466] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From d97567974fd33689fe1cf0e6a8087c448d7c8eb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/466] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c971c297b947feb075ff3176162c15f335164aad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/466] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From df401687800dc7d6b36985a393841e66bac39712 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 302/466] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 495fc2df939dbd607638f2ddf34916e2d70ad5b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/466] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 26cea7b0dc69afc5c30093e29d0030f26d5ccc29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/466] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 97d2749ed1bdf3987a73f4eb0325b8141b1e2c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/466] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From c32a40e1c8c28f49b17b87316258b540aeb1dd2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/466] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac8c37681646d132e01007d33e4098cfeae1c162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 307/466] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From f7dfae59c899f7ea41cc621abcb638ddfa00c7ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/466] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b9dde8756b403730296c043f6f55fbfd9f5ad2a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/466] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From caf47c85e0021b6eb7ac7430be7b482609e66d86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/466] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From d39e97515ed0e302a12d1695af392402d30e9654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 311/466] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 57db1ad39103951e966513a52b990b125378e47f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/466] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 53ef75bf7a5a0ebaa2d1ad5508baaea3197671ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/466] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 0982e7676f562ee380f2e28b0bf8d7348b80ad61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/466] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From d4a7935ff2f4ee35c02acc8396235afe81338cf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 315/466] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From c8607f042280077ca78b8aa3ee4d7ff678405870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/466] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 6db2d818b7d27c05541803ec6b4aca59ea332fda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/466] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 8f841d145214dd6bb42f9985d104d742c0dcb2fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/466] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From dd69b20d3688eb34876f495926dec8967ca9260a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/466] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 2bafc41feea119d4490caac3057fc2563bcbb488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 320/466] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From ffad099bbc983072fe2cceed4da7fef440e24324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/466] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 7e955be61cd294e701fe5f047b37c7cd3c7d5ae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/466] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 354c48ea439d6d29f8e28e2fce601fc8f14476ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/466] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 84ecad8a38df3b2134ffc615016627cd23c7b219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 324/466] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=45.7262
-revision=13
+revision=14
 archs="x86_64* i686* aarch64* arm*"
 _githash=0e8c964915fffb58032bb59bdb31949de718ca90
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 92a059c7a72ba269be3506be399f0a4f60225763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/466] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From e44726da03284144fc50712efd6a5327e3141e27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/466] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From dfdd0a000d27cf08e0bc295c0560f9f85f884a11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 327/466] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..3c77879ff90 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.1
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 59a82530d862619ee60d64f103c66ee44773c5d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/466] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 3e60494cbe650cb2d095edf4502134d32404a018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/466] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From d7c974a1dc71604910ade73dbd32bf362a8195ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/466] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 2a5d732d8860413cb1746dde6a8ebf68925d96e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/466] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 4461e6aa605f4894c2143d7ce5b971fcecba1cc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 332/466] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From bec0549cc8c2bb171028c5aa4591d1f9ae49424e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/466] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From fbc142c8f63683e7c8b4f0538eb4f202f8c4b20f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/466] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From d0f1e3905dd1eaba59c44e69a3239e741a11f6a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/466] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 656a611868f81738abcd3df87ef521adc04569ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 336/466] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From ae8a47b6eba263fd238e1f2b7d9c94bc5a28554c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/466] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From ae38552b7f6118b7e1e92a8b15766daad4f9f989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/466] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ca72f5b42b98349777015f4e3199864d72370a6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/466] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From ffad815ca56b440b78e6483debdbf49c51b6a1be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/466] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From dc46834ce3be7e0fba8dd585f9043c5544ff3855 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 341/466] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From b93cda15e323338420a8a8f42f749f85ce92302e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/466] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 3c38ecdffb381adbae4969ef9b9a770446cd3b3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/466] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From cfbd00acdc93c09ec5f4176dcd89e241806cc458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/466] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 0ec737c67ed383917108e5c189d3a8bb3c23505d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 345/466] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 276e9f002ca5828fa47c01726c0e16dabf6f701d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/466] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e745fdc3f408e5c82eb4dc7c05a2eacbdfc7f668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/466] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 5b0a26895738c0aafe4acccf15b82e6299dea6e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/466] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 33ba0f69fc8e353f25d5563d450aa4cb023ff0e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 349/466] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 5297a078608a8163def4c43cc319ec371f6545fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 350/466] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c4d3c8f76860d27f36f2ed03a5f6e217f56e520d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 351/466] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ad5af4338727cf34b7fdb6611b2ee608b75018e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 352/466] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From d94cad69d5df44844fc8de30757d5f294d271bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 353/466] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From cc8386f7b17c0b64c944dc95effd8a089a373f3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 354/466] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 60b4491abb09639b75f40ba86ce53ab0888bc463 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 355/466] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From dfbe217c2c91c4bb0c03515df23306c8a1ed2325 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 356/466] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 2f786ccbe864b1e323d35b7bf7ba6152efb08188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/466] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 5cf10564ac532bc784c3ee2abf074d3b1ee55b79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 358/466] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 00b293f419713784207611320dbb58fd96a9ff97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 359/466] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From c4e19b78e5e2ba9913f4a8b867d6582c4057d5b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 360/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 3c8000f8e657a861e7bb127665677ef2778c29e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 361/466] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From c07312cf14087eea395df6c9f9c5ca6995c914c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 362/466] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 5c9d09c28b5b92c6858528a6bae7860e5a68da8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/466] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 540121e8973b1ed1b3e7e13d9d1d752f3dd06222 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 364/466] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 4c06eedfdcca7b50414295c61910f5a55ab9b287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/466] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 69b90ca7daa656630220806433e6193ba6e549be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 366/466] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From ce7b977c2c826c8ee4dd38456d525bd6d3da131a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 367/466] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 2918c524d2ddb87aab3064c7f47d0e6de3df5cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 368/466] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 6bfc25cc3149a4439ec6391c65fc8b965ba97087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 369/466] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 946bdbf226877bc72e030ab7776afa743b15c0a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 370/466] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 575eeb37733d7ea08ee38942a46e4a7348020621 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/466] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a9dcd15bb046ea82c5a8d5818d3cc5c59ab2c133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 372/466] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 17c836de533bfd26902afc64ba52764b540374c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 373/466] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From b71b7892bca17ad55d898c340bcfbf9a154d548e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 374/466] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 87f1a7fd2e190237b02a4f631b6200af3162eb5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 375/466] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From a00992e9ad597e473d43e3cf0e51ed74e88aaa50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 376/466] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From c393ba8393b9a50617108c703a04f63804798060 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 377/466] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 487e7c83511f0e65291c3e29ce99a9a0088447ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/466] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From cc54812d88c6c21f06d457ee129755e9c8ec220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/466] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 64a6583fe3033b94f85fbfdc4d6fa338c8a2a60f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/466] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 265b8dcac0f9e62356d3933812a85347a696ae19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/466] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 8923e1ad86385fc95bf3e64c28093d16cbf90bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/466] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From a7768c93ba66f2d656d5ac1e92246785e3a3dbba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/466] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From fc1d758aff5c6b09364d757020a4d43b62cc6907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/466] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 02548de0945457b8af43ab2618991a4b55abe341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/466] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 81f9c9c0e7134d31719baa0f6490c7f5c55e800e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/466] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 61e0aa206ddd0d366f1c68b06c2b130cfed252bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/466] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 311bf942736abb9b3e194aba245c03d1a6c6435e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/466] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 87c5cc1aa340bee927cb885c6fd797628074f33d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/466] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From fc785442b3cb24b7455fe0d371470e5e0cbd3efa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/466] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 6e28ff99a810021cbeec49bafd8f1215af06bfcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/466] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From c5e3e2964980c3f3cb093421b87a06265fbf9dcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/466] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 109a06ffbf8cf82797db012ce8987810eeac58cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/466] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 7f5e5646a73bcefbe7a0f527b5dca413b8ea661d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/466] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0cbfa5c7c2583074ba1e050c077af43a535052eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/466] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 8bb5e88762aab4e971f42b18ba0ea8e9469091ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/466] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f528319ed8db7966a82b88a0eb92e1fa936a7c75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/466] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 03576fb07a18b4e09d73d3b710f56daf30d5a632 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/466] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From c06e0ee9d41ac71ddc6ad805f73e7931853d18f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/466] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4f9f7b06b896333c57f580be396c83e23101397b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/466] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f03de72f10165e82106db549160761953594c71c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/466] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 0602b935703215f62e8198d5621a40d64b0165cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/466] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e9f1020394b456cc8c8414ac36d478e1d9abfcbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 403/466] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 88294cf58e7b64bddbf371aed3ff7ad59bd20192 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 404/466] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 53527fa84f704992bc0ceccd541c3aa42e1f0362 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 405/466] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 17526bd9ef662bec666cde95ab87e77db1fdb9d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 406/466] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 6b926385a56e0c81afb10b9d86363402b7158bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 407/466] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 5465f1c68ed46a1dd00ac17f02473b82e76ac8d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 408/466] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 96ac4f01c5425acaed240204dc5e136c6303168f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/466] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 1507db0c39a5123258d4ee1f8e284faf61f56184 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/466] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 5d40e58311b456b85b183eac3e44ecaf52c7122f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/466] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 4f30944cfd9c33f9f922d673439e1e8bb31014e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/466] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From d1ae7d1871827efa6b02951c26d5b998ef1db162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/466] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 0f639b3ad77ddacb91890e91c9dd8d6138dc8628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/466] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 4554bf620cf8383f1243dbe210b6c49369bc6a54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/466] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b5d5c25bc85347c5f674189f9219229389da431e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/466] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From e5c13d8d4a12feea4597f4e7ba26ecca8533cf7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/466] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bd05d2bb55412a714bd6ddb6202626cb0969ec4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/466] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 6103051ccef6f462bc910ce2cc496c2bf3d9a4db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/466] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 6ce0cbd93b1234f190abf075922e4db5464b4f10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 499994a67b52284a39384dfe41595536543aafab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/466] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 95a646a741a5781708e307121969ac09df87d7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/466] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 77dba70f7e5a6a88496d72404e38059bb1faa341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/466] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From e00976e870f02e417d21098394c5d79015798331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/466] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From fe419b54948f9dc06afe32ea3d687736f481343d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/466] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 36f13d90d78a5d57a632675ac8ee51bb48e0237d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/466] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 72710286d2947b6fafd486294ebb23a9f192fc65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/466] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 6d0aa22ede7a5cb06c4d7cb4be86da687a3f24fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/466] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From a152bfed0dbd0ff9f61df3e9cc0e7f2b247a824f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/466] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 406b1cea5a0dc37d8430ed489c62a0476fb58066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/466] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From a7c87d67fa034363d8d4a65b6b5ef730220c8f47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/466] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From aae274d188ec429fe03ef29e7ef1921dee721f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/466] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From f29f728c43aeb3149c38155972e4804b88d0ede2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/466] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From d0f3b2f12678032fc6367c6696819d7a49479e68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/466] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 4ef5ce661b4dc8bb432370764b750f6845d98504 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/466] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 90d8e8569e27eea02819450a906a95e0449d3bca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/466] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From a278e9ee258a26b936381d92ffbd8e2607bd5ea2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/466] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 78d666951eb72ef353a67450acf9993d2d4569da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/466] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 0b253e1fe30f6ef26fb85f55b230a6e27bb1d5fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/466] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 6445b062919084276ceffbe2ce7b11ccbbff7494 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/466] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From c9ccf280805f578c158de65316629bbd59b554fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/466] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 00d0000023874b40a205754ba429addcd3efac19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/466] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 5fc5b3d84e37d0efa7e6951d2c8d78d0c3eec27f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/466] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 4ecf826a02750e622ce864fa3652e80a97bfe09c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/466] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From e7fff139e40a6d6b32678ff2e7ad9734e3b7f460 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/466] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From ba29246d8852831b10d920f50acbe25bb9c2c547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 446/466] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From da6a2e52e194e98151eeecd941edd2be34132d75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/466] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From c9076a639b29439480fcb3ccfeaad1d95226faf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 448/466] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From f1823dc2676b20898a5049fda52e00a2c98177ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 449/466] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 235859e08bd3757cb0b4f004755add6bfc0cdb03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 450/466] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From dbc79ebc3793b35e8d2ae7bf301cbf933302efd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 451/466] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From f2b81a920239faa2671af007286010fee7ccf200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 452/466] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 040435722cb8ef0bdc084bd84b6e3e15e7e70461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 453/466] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 47e6a54f6bc0d546e7f029193397442ad12aecde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 454/466] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 0b3a3f5e0ac947ca6e3cacafe2fd722d72190664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 455/466] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 7c9b7958958735444e52fbf6b4b54a6143db10d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 456/466] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From b53fbe0d75fdaea7d1e1e7d3010cfea96366921c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 457/466] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9fb4d0f9bed..b8214993d5c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 0f0afec2d8a34496b09bef58f5ea0d52686e7bd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:13:25 +0100
Subject: [PATCH 458/466] vboot-utils: remove package

---
 srcpkgs/removed-packages/template             |  1 +
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 -------------------
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 43 ----------------
 srcpkgs/vboot-utils/update                    |  3 --
 6 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
 delete mode 100644 srcpkgs/vboot-utils/template
 delete mode 100644 srcpkgs/vboot-utils/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b8214993d5c..3effda5db79 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -249,6 +249,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ vboot-utils<=45.7262_14
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a56..00000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856a..00000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
deleted file mode 100644
index 5bac667ce94..00000000000
--- a/srcpkgs/vboot-utils/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vboot-utils'
-pkgname=vboot-utils
-version=45.7262
-revision=14
-archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
-short_desc="Verified boot kernel utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
-esac
-
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
-
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
-	vmkdir usr/share/vboot
-	vcopy tests/devkeys usr/share/vboot/devkeys
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vboot-utils/update b/srcpkgs/vboot-utils/update
deleted file mode 100644
index e360ec80b5c..00000000000
--- a/srcpkgs/vboot-utils/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+refs?format=TEXT"
-pattern='refs/heads/release-R\K[\d]+-[\d]+'
-version=${version//./-}

From 0edc4270eac142fbe01e63c572156e9976c0f7e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 459/466] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From b7a6b52579f48ec7e9f1a7319b88b6a9bd556cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 460/466] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 8b018ddabc8cc23f5c092b54c46e0c13128e9696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 461/466] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 1fe71f49621fe767446d3b4e3c9232ae005cc3b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 462/466] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 3d235710e05a8c1e241261ec4f2e623719723501 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 463/466] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From b20e22617037dbedf1b218e7614385418deb5e66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 464/466] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 25155759132c8e88759053383787730eeb75c68d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 465/466] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84498596e21..3196300abde 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.18
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d675d6ee6dfaa3febf2578b346a56851e0bb413d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 466/466] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 577522 bytes --]

From 61c93fc9625a505f20b4b79354b55e69f6249f37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/466] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index c9f9bf389e8..15802b2a67c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3459,7 +3459,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 5e079574575e048cfff95005435d73572f8bedc0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/466] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 7580d0f4c39a627d0214cf923121844880362780 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/466] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 3adb11b8eae282c79d7b002471290eb6979f7eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/466] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 16e3a1dd55b7af7b4b7e2dd3258b3a349c21ec78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/466] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2ae94c5e019feb45c9537c5c4808fa1bc784c6c0 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/466] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 15802b2a67c..527b67d9ffa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1773,6 +1773,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From cec2d9a6d7231f86af25741ccf2a4035498679c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/466] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 527b67d9ffa..15a06404bda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1773,8 +1773,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 91b75518ca4961d3bf48a5da46e5b55bee7f294a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/466] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 905b2aec340d3b555db1e3453fc8ad2a4f582f75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/466] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From cab1efdc097beb8061da090c9f5993e284bc15ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/466] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 8b39ab019996bd1c76d573c856b2eb57e2df5567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/466] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 9038571b9a8c93fcc97101d937f2e8a0fc456507 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/466] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From d02f32943301780923a72af23c1ed155fd6fe26e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 013/466] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 10d9e4a79354dc8bc470bc66199205973258f754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/466] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e814a069d232292649091064473f919f9c9260d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/466] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 605512feb0a6265f3944b68386a3e8e45b79e84e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/466] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From cf1591c2e4c2ad79e32c7953b9d97e943b883d8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 017/466] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From caf33c7a8abfc77f418933869a5c21d359c9627d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/466] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b6202fd7eca1304253a055e3274413ee8e5bfea5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/466] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 09f74fc7f2c46d94faf818a84f8055e7744eeb3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 020/466] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 4c80e4c52da223e6ec205e7f7b9cd5079f3b1641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/466] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ca9c79ed73ef431ace43ad56c2c4f83311c56bf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/466] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From febcb39dfb20fefee11a315058b1212e4e0b7cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/466] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c52edfe7a32155336dc7d633f66bb6c04bf91b10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/466] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 22057d4a421bf6488298ffe182e9830cb96d2aa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 025/466] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From c801b68734dc970057794d63e3649dc6da268e46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/466] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 31d560c995309d1b386e56b3241a1f8d61c792d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/466] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 69b14c56458c73fe7173857b14c84fda8daca315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/466] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From a5498113e0e257c9b7576399a1f043de8081dfd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/466] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 1b054b8789c1104b6a22b03f58b37f249e76c83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 030/466] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From dfc5c53b2a81d5349ec08ef006f40e3f2ea076ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/466] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 793f3f618cd92da9dd95b74bb89546f39d465ea5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/466] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a3254939af303ea00a02ed05c13b0aec007943d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/466] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From f973f0dd4fec05c86f1a5d31adc2663e23725c90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 034/466] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 5c2c6cde5c633a67515c9969afbc2f32554c53bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/466] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From e5be96699d4a8f74168f883fed330643af50e9eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/466] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From a9445857f82d368921a66737dc1b40020e6a5f8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 037/466] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 73dd6f477c20de87bd22bd670cf30afab0001c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/466] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From de59e5770d24881d2bd67adffb3ca13f3217ca5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/466] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From c28fa72c0866d6208fba27686af181fab9a76c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/466] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 08a87cef4daec56bb0a90aa99afb348882f0e837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/466] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 2c325b86449c0a8c4c4da7cde416f4fabcad5107 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 042/466] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ede0d787008e067f7c0ff069dc560bcd4018412d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/466] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 2b66150e741b6ef35e6becb1b78c05dd09f8e2fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/466] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 8619481d81289f077b3da5a4f7c80b65e07484e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/466] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From cadafae1009403f9dd7ec5f6aad6e8dd1816cb8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 046/466] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 21a8d3ebf9656c4843555be011aa0894c2eebba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/466] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 5cccd31455516dcf657e0f04b8526c075fa883ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/466] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From de1ef95bc5b71baf4690f8bfb5669eb384a40895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 049/466] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From e2ffd654a2666e48b8a68a3070f51082a1c00664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/466] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 760914372d4916c9e73e0063e30804d6ac5b359a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/466] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From fb7fe7f1ee752e9d9b8e7c5f9403477583980cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/466] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 4e159f7c96ab1a2d740e566aad7b451d4ce9ff8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/466] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From dc42b8b98e8b9ae63ffcd9173c55c5cd5d8a9563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 054/466] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 77d6dfa5a7f2e8e9299cdf2d2bafb03688752726 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/466] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From e42119c9c082eb2d8c233a86e7cb81f892446e55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/466] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 8e32b2a16eb2e2c4962db6d583aac5f2dbd2df74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/466] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From bec0842357782096d690d32619942b5866b6e59c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/466] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From b5924a935c87b90ce7365477e481c0d244b901bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 059/466] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From e4a8f724f22800d8c923717db942b21c14ba3495 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/466] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From a49eeb404ffcee526c7024789f906166b01966bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/466] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From be386eda6524d7010d8cd075edf4a3538f1a97d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/466] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From a2ef7a494a6dd37b5fa46b989adcf946d714bf7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/466] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 230eed9375b7674b1948e4f9c87b838b295f9bbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 064/466] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 8bbc2b55ef78e1b39af38832620cd75f9ccf6bb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/466] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 7aa37f49c89614073ee718e722cd772d5f859afc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/466] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From ee8c9d442465bf1b5e9ed60296ba223ed2095910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/466] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From bc4f8fda5a14ced5f6ee62621345ebdd4c632b2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/466] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From a16f511b417415644bc14415a27b9601db176599 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 069/466] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2c252c9199060d3887a1af1468a6e6ff15135b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/466] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 2b3656f12c0b42d932bdb158fd106c1854b9f6b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/466] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 4b0a1ca1e67d0188bcf556280a177250f054f783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/466] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From a22487b6927f69905841074cb689fcb39bf5924f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/466] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 9d3d5c139a5c102ce58a045deefcdbe95d5c0590 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 074/466] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 337d3987838932627271efbd0813cae7f22b27ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/466] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 25e221a359f4a6e83769f2e7deabaf970045fb46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/466] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 2e1c52867603415cbc3637481dbf0fa0b3908340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/466] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 6fd10e743b0eefc0dc2d984d50d5d0948b0594ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/466] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 927fc6ce2bda6495df13ad74ee1b3891c5c58cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 079/466] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 859124b9fdc6a7bdc64a7e1ea2ffb64f65587344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/466] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 5d25033b3ab8185a7ec6c3de2edf957e185f224b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/466] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 21e60fb9b49b5294d8c163d394ca0eee8b8413fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/466] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 76081ce948f9553fe9e4f9990d5482bf021a3b35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 083/466] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 3de41142fe5a1f9abe260cafb28a42d8847124f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/466] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From a03b01192c649dce0e4eaa623900664eebcb0c4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/466] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 493bf955116dec4a2045d380b3ce02b653ddc366 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/466] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From b3ac163f3f903b9ef8e75ec7b6eb91a712fd2cc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/466] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 9054f39d541fe1dc16c105cb4f71d5d5c46b1003 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 088/466] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 3a366c0794117f373daaf008d659c043e303175c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/466] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 2cefb868e4fbf8117319df07e10392d7d6ac88f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/466] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 5a7bd221a5358261742496a6064abcc3298af6f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/466] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From b9e1b510f1f86cc09027cfe9264a607149cc4e71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 092/466] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 4471efdf4a90462baecdf34737a8f5d151401778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/466] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 09b82cf8765fd3b9f4a9bec730e8641c5f98bbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/466] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 2c020d2df1e8c58118da1e2ee7c2ea0a0fa9a27a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/466] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 623615bc6c28f1de0357b8861ac8471c8be4410d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/466] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From adee0a1ba7d613560af68cf72b196f9dd1e53007 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 097/466] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From e5759b0fcbe2c0efafa5ce4fc7ee3aa81f2bf32e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/466] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 7f2577210d0299b5ea004feb6ff0776b188fc050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/466] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 24f5c90d70afd947cf2c7c618cf3581358ea86f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/466] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From b674ad60e7588fecd008c1b6701aa3913c0fc577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/466] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From fbb7a99cd7cd007c3c31b9388bb8f7c30d112584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 102/466] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 5f56e8ed8a3548421b2a051b2a9a64ff9a914e9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/466] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 27770fcef2897171636a71950fa5a11b6e38680c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/466] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 94b861745bb3a740a50c57baa0b0ad6e7b6ea14b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/466] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 7def9e638a6a6fe0afaf824917e485a284dd33c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 106/466] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From e16d6f0da4fb8444b89ac6065c88a01c4434988e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/466] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 1b71dec038d47d84dbe06c15029c1e6ae9a4cf9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/466] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 02664175ee676d95c94a17e067e2480d7caae6b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/466] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7d5336895d8411414ca41f042b654e782a1302a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/466] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 00c28d670e68516e5fd939a6561bd28f6de8284e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 111/466] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 5b5b7c5fc02f2396f8ec0bcc88a087d203e6c34a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/466] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 08257eda0272291ae603c471ec2a63fbbf6d2fb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/466] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From e4b6864e397ae7ba69248a1666cb24ec06f00822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/466] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 9cf0a2dfc1b0f2e18d679123f3df783d22337c4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/466] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From bd9e3ef2fcae97f64675ced77164e25b97069e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 116/466] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7738520f6a093f915fb6d5d6646d2b26f3ba9fd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/466] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From b5292a34cf6d794256ca466347f53cd47e75c496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/466] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 3920a54ba6188a125f96a704848b75220cc715c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/466] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From a3f6b664136f1e31ba2ed97decd178972e1d3d90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/466] kea: rebuild against OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 699140093198ff46fa5167479c01b228e4c34f37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 121/466] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From bdadc560a043241d22867d126330040987b7fdef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/466] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From c3d46c22c7c875b7e36f1df5086a5c5a85c90594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/466] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 41f9bad42ecd08465292ab6659a4cc6d13c68bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/466] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From cdf2445bf3186eaf8d82e0966b6b39d811ba9683 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 125/466] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 01b432f095666ff7f7235cee6cd0257af2837766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/466] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From d6dd4e2a2d5e6a0c1f7ed67aa59a7858d20c27f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/466] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b45dabb52b39726855269424db4642351fa13b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/466] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 5a9cdcff547e8f37600db3fc136d427c110be458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 129/466] lftp: rebuild against OpenSSL

---
 srcpkgs/lftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 12da2e3d1083ada984c6b32d6ef65b8e3079889e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/466] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 3a87b31c2d99706e255ebbed544f6a1cb357f51b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/466] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 6f95b85cf87091fddd666b7cea40d5c1b1bdeae3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/466] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 9f667273285097a6f69b439e97d820dd3a628615 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/466] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f20ed2ded219c9e7a395d0ee633ef6cee77630be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 134/466] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d708a5440e5d9b6764661b7a1b0129add705593f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/466] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 7e4844efb23ae658960e09a9428ac180da706a07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/466] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 4f51eb8304f1496200f8fac0351f69fc23952c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 137/466] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 4be3b5df76c75abacef1eae4463bc3291962c019 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/466] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 12e31910f189055e3561dee028712659c0a01ab6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/466] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 70367bfac23aa84abab5c6819782cf4691467a78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/466] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 9456f1642d4c21b3934b4de7301a0ddaf83e1181 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/466] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 34229739fcd3c101d0b12ef8775ef2bcc2934564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 142/466] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7c042189b970ce1d6f9fe187e5b3b1ca19a71c4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/466] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 6df76fba2c98245b69ebe15ac2357ad992fc5ffb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/466] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 94570308d23427f0a10be739b955718cc9c67f0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/466] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e7f0be4ded0131b1217d58a26696b8b6c9d37a0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/466] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c3d990e898c352c5ab7cfd269fec24f0818ca930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 147/466] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From b368eda276517395522a6c94f18c8d788340559e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/466] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From be5f7c6e533e42f76da43338dc148ed8c220858f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/466] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 9d2be70b8f86bfeb6bd0ae377c0cca782ac00a0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/466] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 34fa5b6a2b4407b78937d29b3b025a04868ef4ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/466] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 42dba5d3a2844c1df881686dd3fc4f0d8bff4cbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 152/466] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 4958d8eb40c46a1d4a5a39344646733d70787822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/466] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From b892651540f9adf887f4f2516e1ffc2c15022ea8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/466] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 8a9322a05a98b3d552ebde5166af4d9ef34d750b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/466] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 40c6967f75c235db4bbf68188f2ebd36c6266388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/466] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From fd2db518fb2540001980898105f1ac785b836f15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 157/466] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From d0ebe9906b0f3c2b304e91665a630a379fcb66c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/466] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 0c04537c843c34a375ba13e2a6b6f41bd07cbbb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 159/466] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 32ea9b675f14c83c48c36819430558d2962d0954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/466] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 5e83b08f397ca9e5fd40905a25c7425bae60d640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 161/466] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 94aff2297f274d7e88d20926460171c5c2ede3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 162/466] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 95204f01b34117a3f1588556944cd58df82bc528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/466] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 625a3f5b5b91fc7630252ae2fd119622795d032e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/466] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 01d4b38bf8a8a3094ece8f0f361cf22810bbe3d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/466] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From d79cde8c79e51dd489d88ebcb68129b89a4dfda6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 166/466] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 2107cf87fe148fa6131f27c8a782f65925bf5aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/466] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From a4baae7f73134b1a65584e4ea3bab07431e3f5c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/466] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 433eb533ea8d06fcd6de2400780db5eff9bc3407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/466] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From d0650f55ad06232d75c9a578c951dd9ee409833c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/466] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 14a7c886487643d570ae958ce31c79fbb6f25d7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 171/466] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 68561d041e9c9b212fc81c1dc633dedb18ea5526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/466] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From bba1d0b18bd3d3b0b101c5c4187ff67982fb0d64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/466] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 0e86c1ca8908242a2bf38a90439e7354e69528f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 174/466] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From b639ece2eefa3288d313c9f44026c1c5e1e5f3c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/466] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 05dcffbf71217416079489ff7e6b39a815717c62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/466] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From da0a44abd0e2f5c1bb02d7f946d72e6c98353fda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/466] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 531b49638c1368aec3ad06a43775630ea8f66b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 178/466] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From b703fb028f9fcc9394dfd8923c54efe0bc956654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/466] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 13a9ef79de1f8b0f562ad3bc66f1fd7e1ae1cc9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/466] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 83484ab7fcd45f5751ba77e9cce342fd933f2cca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/466] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From e58e2c0766f36b3ebecb49b40fbf85cc62eb7955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 182/466] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 1e1abb1a4d3d1f71eca757068e2f9848e3281f70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/466] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From cd4d5b40e2701494bc6859c3e3368ac4ed09b6cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/466] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 35d0212408dee507a35894559afb117c16914a31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/466] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From eb36cdbd17700743c157c9312ebfd29a9c305177 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/466] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 1afad34ee2581a84441dc184aeaad5fa84c462db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 187/466] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From db42c96a5648fbf1eb96f15d0793a636a64a138f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/466] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 91178e19e58ac4d63df4ceb30778258bce06cf02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/466] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 8a007f8e64f6d0fc541e446fe08ca597cefccbde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/466] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 02c2e57860ae3717c581a4267270837634868ec9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 191/466] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From cb23221397c1879e6eccb3d6e92df61065b548cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/466] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 5164f586828868dfab873aa317baba01b6e36d4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/466] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From afce8846cf6c21aa193b7ac8bcebffe17472f0f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/466] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 6389de4bb2fa28d37ec527610f8bdae8ace699cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/466] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 6ce7b661ba035dee325fae177e2d5ba343a4ed19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 196/466] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.1
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')

From e16ccedfba6393f39b3e4e13d52301d16db81b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/466] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 6b272002d6bf2a3255ba2154dcb89d4050d6126d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/466] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 839c0d564426920161a7524954177ccdbc3e824d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/466] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4de3dddb4430b71f6c1748836b96a1fc6d94df1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 200/466] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From a602a4af66c5446c33a8b7f83e861c537f1fe687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/466] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 942ca41229987c42f96ed54cd40805bbb69f1418 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/466] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 2b7c8576fcfca12612be6ef7711f445de04aff2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/466] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 7cc86d63d858b3826ee05ddb66e72da18f846715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 204/466] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 80f4d6bb707cbd5ce494c06d1316bb53ce01e78f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/466] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0cb212fd69524d526b22496072b56c9ea0dd78d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/466] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 37a2218f5313914d058cac37d29ac45e3f854bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/466] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 65c31f3e5bf24d16df5dbeaf9406eb32063be835 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/466] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 2e97e0a866a78eb2aa3314a1012cdac3df101b7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 209/466] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 3a8fe6f1a6cd91b3e7cbc20510803ff9e5207034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/466] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From ae0ec87dba660926ffd34b727ff00c680d12035d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/466] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 4d80bc9962b7f819b1c07e79fdcfdec869015885 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/466] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d814331de2655e094c6b4d0986605bf8589657c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 213/466] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 492dccaa8a1d55851edf263532b600bc085d41d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/466] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 5904f57f7f3fa695ece961521b48e934f1ac23d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/466] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 85d61ad81276a0ee4fd8f50607f0b69318679ed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/466] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 0ed5023ea3dadf1fb9ba393102a8006ddc85b447 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 217/466] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 062ed5fd296f7f667e7b9670afbc3f5c30449d10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/466] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 75cf3bc9ddf6934f463003f816f4a174da8c377f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/466] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 33f7b3574ec7e038cce03f80bd9d7f6af5fbc305 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/466] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 31956d8e2bdd4bf870e54ef84cd3eba9d06c0970 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/466] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 9cabe05c815a68930dd3dfc3a22b32012e411bb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 222/466] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 282fa97bba58041b6842e0b2576ce04d18fb059a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/466] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c95284cefe8007fa88da4d7e81403767347bab65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/466] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 589b0d720a680b747e25321c8984cea0cde08193 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/466] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 13e4e759850f7e71096cdb7d3c2ca35151fabada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/466] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From e32c299d76128c48bbcaa777058891d269e37adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 227/466] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From be112f8d244e75931da9a17b0496be880149e950 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/466] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From c29e2bdf953b771a44d8eb3dcdd2e86102fa074b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/466] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 4efc9f9afb3ac59c2d4dbad0cdfa92cda5571528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/466] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 07305f2f02af0e4b7e607a573791c849913cb653 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/466] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From b63d8b5b4bf8276558d6a69558cf62cbfc3afc9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 232/466] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From ac25925974101a8c7501866f0ce009b61ca0fdc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/466] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 6a0e5dc3b32a46401523725c02bda707d4ccb006 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 234/466] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From eb9f1bab4d35f979ebb25e3596e430dc706efb1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/466] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 932a0c99aa5fe79fd13e5f1ea4d5014e12ffad6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/466] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 0479598626429c0fbacac23ffd8f6cb110cad992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/466] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 70b714c9bce62392666e22a56344a7af32acd154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/466] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From f0a7734af0dc9b9a900fefc24a05f1eb82aa4413 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 239/466] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From c7a96a1e250492408702aa7b32a2639a6705f67e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/466] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 637faf5181de8e07eabae8cc05efe072bf70469d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/466] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 2bae8f9533c790bdfe0f73baaed1927ab7d13e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 242/466] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 9aeca8e50403d43edf095e245a6ba29b795dc3c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/466] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 66eed46503dcd7cfcd4671d1ed45d21d89d349b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/466] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 613207f89bb459862435d8008d47c40dd6d4bbeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/466] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 281a24a34edb5fa3cd045bc89769762d52a48a49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 246/466] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 6670c90e557feb4bb0c771feee7f289206a746a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/466] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d8b03d25b27ba2b81f361e5a6f066273d92beb75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/466] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From cec6f97323e7c0292b4552f0097570bea48ecfdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/466] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 8840607e834ef2d3645f581789a3fa89a53815af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/466] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From d8e3793c2a183c472ecef0f144edb25cc21f85c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 251/466] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 8808df28ef61255c1093246832bc9696f693d008 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/466] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From b498c21f48d4bf314c6a419fb78fa930874f79ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/466] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From b43e8949db1f924aa95ad05b1fdb899003364695 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 254/466] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  11 +-
 2 files changed, 7 insertions(+), 424 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..ff821708a3c 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
+_openssl=1
 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+	CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
 CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 263c5754ef25c106a73e53b3719dd25f6ff2ef26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/466] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From b951c3bfc2ff5b2ef6a1158226e2adc3915c4bcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/466] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 2de994c65f2a15f7667c0012f3bea42458b387df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 257/466] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From cbf15894cd72ed7edd2e1551d5e435e1b0ce53fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/466] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 647d1232be7b939a643ae7ddfb89bc6c68de64e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/466] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From d8eb90ba417a26ea7ca1f4ac5d03685056163e9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/466] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 840ec799ca0d2e71c3a2cfa1ea4bf98e4af31998 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 261/466] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 7504b72d95911079ad57e420342955f5151af6f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/466] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 6df8b6ea80083f08896dc8d44243cb23213ee90e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/466] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 6ddf09ff30b5578f037f64f6a0cd3f4329831d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 264/466] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From a46dbd4e1b071a863f3a29a1d832f353f47d466b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/466] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 8f0d40ba0c1f6b1b5f4ab4673f75c2abc1771473 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/466] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"

From 19ffc63fc34e179124dc3048c01a7a5fc2922487 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/466] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 188bd6a9fac5ce35ae44c9cd77b2945467bda5d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/466] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 412191316604bcd5143d70569e554864a00aac96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 269/466] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 35e4716ae6073dd1ee8e258dce6a8c149db40711 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/466] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 4a6bc7b87ddc9932bd51ad70240b35ed9964481d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/466] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..36ff25a4e0e 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.21
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 29d919381aff51dbbc2b8ff319bfcaec6b747a06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/466] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From ff5d67b55aff00b2a7625d08e92a981eaab3dacc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/466] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From d7bfba702e98a6b111d8ae97137f5a1106df0e00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 274/466] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From be63482df6d3c4a2b69e5161a98e15e395fa353d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/466] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From bb3d3aea8e7c344288e48034b8b2c6da151ffab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/466] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 27cdad83091a65ad371b63cc1771da15f0faa2e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/466] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From fbba8439a3667692d219e9e49707ee734fbe049e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 278/466] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 50438c5dfe054411f67afa3dd949e8cb8cf4f1a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/466] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From e9ff6c4fab25817b7e0fc70be33aa23f94443809 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/466] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 2ff1fd6ea7708e2a12ddec1ea163d69d1a1b4f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/466] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 2015e3d22339725ead3b5c0324b31c7bb7882d02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 282/466] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From e3b5ac7dae87a32dfde008b52d7ce9180660d469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/466] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From df744b778d029ef1b9d518c924c5f3960d20f940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/466] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2ae3f961276465abdd2856e9ff753d03531533c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/466] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From fe0680191836487141cdad727b0dbcfd57e9b045 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/466] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From bf6eb901ed1eea444062691055d6dda1124adfc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 287/466] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 49080462648d47f7ba2732a875ccc93d966cfeae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/466] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 68e5fcccb7d677ac2b04d9d562e56d7caedd9692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/466] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From f9465b1e5328d98d4cc208ad4d83d320a2517b33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 290/466] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 6f1e5d9d7f65b23c50aa4710dbbef5d5c877f3df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/466] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 197f648aacb554dfb25b3b8dd0f44bf104b26705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/466] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 455f36c43762d0049fda819ba936744598013f0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 293/466] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 3163557416ad6cefa9485e46e15d03ef5b293e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/466] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 91fa6ad80ee0d3009cc13c6bc7e92505acf7b291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/466] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 2d27f072d2ae0aadcd847c98506f55c62d6e7141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/466] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From d17eb8c860f4f185d3113e5cfa70b3c042237bff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/466] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 4535872358ccb2e365c2e18e6e48da9d514ded42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 298/466] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From c0d2865f73d5b482bd51ef4001022caf04ebecaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/466] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From b2669bdee726613ba4d260d6086ae18fef9211d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/466] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 10d8aefd8912814ba9c5af4bfa0056f038b2c2a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/466] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f409ccee5f0b5587bf71624b404d1db1270972b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 302/466] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 31dc820e758e59d8a865880118996dcaa5216892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/466] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 569121d39a496e7eb97c74117b7040c241ebd129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/466] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 57d474c28ad47219e3243e7731f812a83e543539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/466] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 0514c9578fe834d86075627c12a6fd0122e7ef3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/466] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From be3f649463e19142c05ad6fccf7c96c77dcf55a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 307/466] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8db7ea9e6acf6d3641e8718c718428235981ba86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/466] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d1da3713ce95df8b3065934e0f614ad49e4ac38d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/466] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e2f1f627f2594c40627d3584d912d0956b9bee64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/466] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From ad02ea65714a1eb1d01290037016ddbafa620d78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 311/466] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 82583a1a68461595528f148755a78faa9afdb347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/466] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 1f67626d183f3e0b6f564b18476d42326e8e17a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/466] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From e02023eb694e1152bbffe3609cbaba69391c562f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/466] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 2c32768f2fa596b567ba4731213c982b989eb394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 315/466] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From daf319ae0245005e8bcb8b69a0b682a1e674e6e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/466] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From fe2c91da20ac1067e9f80b4c12504f8ff3e8ecc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/466] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From f572af743490bc93a7c183ebf84bfb2372480870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/466] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7b70586fd462bdc993e4090522f6aab15889f975 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/466] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 414181e422365d78e9ef2bc7c44fcc439bb31845 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 320/466] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2bbaa8b48309f109d3d646d5a07967a6197cdbd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/466] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 1310a6fe5c7fdc0791301d4f65f9611bac219d85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/466] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 3aa85481d75e8664d03b87430b0687fd309e3218 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/466] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 23fac143ac73be30100641e005061071dba2f64b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 324/466] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From ffba0fc7ce720d25e3e3ebd17e5602a4b6282e10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/466] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 95b55def0b294ed944e5c7f5cffa766da21f8676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/466] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From a9fa6f6152d175812d318fff1cad6ae3a14f93b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 327/466] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 8fba7c21a0950342651516d0cfce9573a5071588 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/466] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 224b8a59dcfa31daf4981cb987ba3fef40d010cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/466] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b6c4778f9a86892dd5598dff2695727df82afeb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/466] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 6a5c241931bcb94d7d2d5e0442acd8c8728cc955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/466] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 7362d2af4a54d8140d3c63aaccfa89ac09ded5c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 332/466] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 127aac2857f1171cf34124f233854c0ae53a4aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/466] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From eda3fa2199261a71220488ac610d24ccb25f5d3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/466] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From d516fc67c4b93f42cabee60a2d9d5fe992373424 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/466] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 7e00c0b1d52b8ad5df99b5c8dfb13e09aa1b3d7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 336/466] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0336fefd8e3b3d3a9fb4286f5315534b81063306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/466] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b458d7826d1b998bdd20baeca8e6488f1e27d12f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/466] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fdb62746d90c269dcdea66c6e71722e61f94ac37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/466] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 76f4c052f1595b9e67b664e3992cdd68257ec111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/466] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From cfca929a432c044edf82d7786d893450dfcd2608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 341/466] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 2789ce7bb10321b617b5260660dfc0237094316e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/466] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 6a1bdae09b97b235a9627125cf362df1e1cb44d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/466] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 207f6fd3fa80a22a1b4317782601ee85cca6392e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/466] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From a0ccf6bb815d4391fa4017d737c1ae08edfecdc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 345/466] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 38abd49ed444e72a55854ef72adb204eadd0b37c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/466] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 550c67cd7a09d132bbb537d6b343587294357de6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/466] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 3c29450bee87aa612b26d998dba7772ef2452bed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/466] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 2de3bf94ae1b2421ef1f404d8a562fed06b3ecd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 349/466] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 6e36c45a72988ec9f79ea974d164ceb517379c49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 350/466] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e2dca67d9a58ba38d6d5611ac6d9487b55cf7252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 351/466] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 280bf09b43781ef69cc8e05de1a8a83520f43adf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 352/466] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 3cbedc9c9ff8e91ddc1950ba4daee1bcf7e14f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 353/466] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 3fe493dc89a068b8cc7b71ca83a00879214a7842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 354/466] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 175c5e7838f3ef00558aa4e6242f2da4707dd4aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 355/466] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From a7a969ad0e78181d1e7fada246bc91fc829228ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 356/466] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 0519a335f8b8078eddc091a7243d7d4fd49657be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/466] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 559a5374e1feb8059450c15782946df152c8195a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 358/466] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 2fba0e95df33b5c1e2e54189851e9386bf4a5e2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 359/466] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 9c7662f430c77bf1e434163466d8ff72746bebb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 360/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 4e616bda4a76811904a08b47d694a949151938a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 361/466] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 1e68363be9a8de15f0bf27fa0616545eb7ea9435 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 362/466] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From d57ce678307ccd9239f9da439f6c74d3d6392a34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/466] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 597aa44a1f40512e37ca6100de0a8bdcf7042091 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 364/466] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 7c2149cbe539dd751636dc0907ffed9c5cb669c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/466] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 50382f7569493875fba695dd5dcdac6dd9cb5b0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 366/466] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 51407495e09aa95c67d4e157a81058dc0655bc82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 367/466] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From d3223389a4252468eb94fe7213d89f32429f914b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 368/466] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 7af5e6b0617728d1427416bbf396cf7326ea1921 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 369/466] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From fd90299e3d66b1d1a998fdb30572ba33d438f2b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 370/466] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4d1c017df8abedb8824b4b9ab3c033165d3c9df5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/466] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ac85804d9126a701b367aee1a6f30ce71aba162c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 372/466] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From eaa3e4fe5b126358d14f2a316824dd4a644ca5a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 373/466] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From ca9f9e3e628974ff824cbc16b58f778fa92ed54f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 374/466] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 7abb54808e4de3fed767c90cc960093f2a38287d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 375/466] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 535352760ba977024b0d29b0ee99101d407f7c5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 376/466] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 093bb1ef23ddf49cca714dd72688525380a5b776 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 377/466] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From fc1fb0170af99a80b6ceec15a9f6f75251f590d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/466] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 1be427fcc8e5840247bb5443ad35b0b6219c465d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/466] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d616de9443c1166d5dc55e95943fe3050ac5963c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/466] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 1ee3f588bfcc53f2b7d628ae597c7a53ecb4b921 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/466] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 1d694728c6eb585c38df264f86898d0924475ccb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/466] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 56719263c260cb08a67e82e271ce7de387ba65e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/466] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From b8f5e5b7d77f79727fcea3e7b6bfe9151579e87c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/466] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 20415816a460421a7374b4f890ac1431df5f0a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/466] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 34a1f0f1f0d304515e1e7a8efc2f836e9bac78d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/466] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 0e9389982e9750a675b40b1cb02a2913f4645a6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/466] nodejs-lts-10: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From db6c90d5541c33058c4ef51a4a380196c2f006a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/466] nodejs-lts: rebuild against OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 1ca20043fb93729424c4118ace665cac485d6aa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/466] nodejs: rebuild against OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 797e63eea76398ed494b76d9546e762dea3a2197 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/466] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From d03952bd732dfb271b7c600ed9d9ca54accc9b48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/466] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From f93b258e179372ece6dab6a8bde83f5734861b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/466] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 1b382e721e65661bc7107328f074dfe0f17a1d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/466] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 462d90d1c42f6a6ebd2d87551bce28cacebb2ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/466] openvpn: rebuild against OpenSSL

---
 srcpkgs/openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 02fcc422e5a0cd2fb6f8bec3b2a86875d6d0b1b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/466] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 81f4e8913f52491723a41f374351507469e9fa50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/466] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 01b9d9978430d438ffd756edf98a3f35dc57a7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/466] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d825e361f98279e1a9bda740ea7570414f6d1067 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/466] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 0028930f4454c2140c9321e142b0240de49be0c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/466] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0de9acae08c9a918c55371fe5d0f8472ed291208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/466] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 7d0a33e4cba85956894ac655cceb370dc0c9bd0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/466] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 28189e9a5d54eec3d0d56a914417ab87aba23b66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/466] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 8c615977034023e73a13b90824e3faa0b2dd3619 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 403/466] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 216793d2912459e078f07588c2a92a090ed758aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 404/466] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 4c7f3a7ccf1fd45dffcab1e59629ef9d0d052c76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 405/466] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 2b92d238afe4088487f413b08c34f7aad124b30b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 406/466] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 591840343a071807aa2946720b8a94f2f2cd64fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 407/466] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 842cab20c21cc210daac899f0e81c0ba24ae0ada Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 408/466] s6-networking: rebuild against OpenSSL

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.0.0
 revision=2
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
 
-build_options="bearssl libressl"
+build_options="bearssl openssl"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From eda2ba8102dfad051d5f09f244677fbb9ad565e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/466] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 583e79e256188316a5b368e2e75ac008a5e9b64e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/466] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From db0d31385143aea308fc03c9886f56c8d533d57c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/466] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From eeca49e932d0aee2ded5dac86ec9a9b29fb708a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/466] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From bfe6822f13e178a6e15f43e2f312a5c047d97d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/466] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From fb05c970985fd78e7a24b634ff7518a4286f6908 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/466] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 52b2ba4706c47c6c89151f26624479f3d88ccc8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/466] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From c7a96fb877ff626b78867b0cb78e9588523ebe88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/466] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From d70c199b3f374ea36632c2442edce7376e6ce41c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/466] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f11c1bc9a4081da0f9daaf4b34e452c38274ddd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/466] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 7e7dc3e1d103c54d1ddab16e1505da66b1e514fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/466] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From e2bb388971f79fd9d79675960ba9c99b4708ff27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/466] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From a20799d79b03e3e078e75a573599d4c45e9c002f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/466] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From e3992dd0eb97b1dcde9cb839debd2bf719858dcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/466] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 10eee455da0ad30581bc038c1041c889807c4598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/466] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 625771cf5a344869f7f59896bc0630a33874d14f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/466] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 9d1e135027964dcd5220a15a642eefee0aef785e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/466] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From f4bc74e5f663578351951abaa4caeb6ba9cce61f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/466] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From a241293f8f8186b7b7d9f1dcdefd2b70f633c92d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/466] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From a3be9d6f8c24bb819b1cbee5b0cdf68722990299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/466] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 4ca13171c14391e9dc2c32b6a3c0db6ab334cfb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/466] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 378da605b67cf649e4bf6f7fcc47fba1ff1a2a96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/466] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 83b2b737b97da85f8ae7f901ceee9a81c4cd87bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/466] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 4c0e40940ca2e1385756f865806aa2fc98dc8db5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/466] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 832d0f088b8592ad8485925248df83cb2ca8853b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/466] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 4284af5237343363b7315dbce7ffb0a1718896ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/466] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 98c7a13978758a534ca7ae49f7729292e7ab1829 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/466] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 11ab6a542617a152efaa020be16ae0168f7d31ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/466] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 22b66af1710456278f35eb306078641764a96708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/466] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From b849badc9cf5fa45c04c08168b76a4ad6084b588 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/466] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From bfd17e659d9852ccfbe5600e3bc94d9034c37c41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/466] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 010c39cc3cded15570013fd9adb3e1c928969490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/466] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 4f6770137d1c1aae0a7711d252c1d0678113d8bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/466] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 022ac913b54de46230db521027d7d11666bd988e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/466] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From af8465050ba3f7bdce582cfc82089fbda85b3a02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/466] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 1c095ca4b7f327a715c027a5d42cbfd11c1e3831 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/466] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 6c4a9d94051bb6b77f1c6d42ec1d41e8e3e38661 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/466] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 426895fc7f18f136ca9a58e8c37344b576633ed4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 446/466] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6410801771d1e73cd847bab659d9c1616e1596b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/466] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 84195bc4ae1ee70bb4142e16153103dc28b3cb90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 448/466] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From ab25a0e839400b713e291d001638335869c5a654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 449/466] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4206bea1d7577e3b703aebaddf41264505f01f34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 450/466] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From d169bb527ecbd94dd3fb65da5dc6c17c15c540f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 451/466] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 5b510034fc6d2a6ff8fe963d32580e2f3581af7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 452/466] catch2: remove upstreamed patch

---
 srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
 1 file changed, 4 deletions(-)
 rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
 --- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
 +++ -	2020-12-31 16:19:56.118506507 +0100
 @@ -44,7 +44,7 @@

From 538015f76ba1eb7379ce5f2a4069628a6527f14a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 453/466] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From c19607378151f81f2d24fcf0d10480c5c2cf9aa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 454/466] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 301403405cb1946c85075fd5e3e0f8ec070dd0af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 455/466] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 310a118fe2e410da0071a0f378f65bdea3f598e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 456/466] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From ba3056bfb0969757d9f6ecf4b99a766fd7fecfc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 457/466] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9fb4d0f9bed..b8214993d5c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From e5e48a6701702682b1f3026f905bdf77853c39d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 458/466] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From ebe90600c456f2fba5fa37827d5108f2a71d58ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 459/466] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From a64c3d726752a278d3a090ccf4718fc68ae51c43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 460/466] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 02b92df641e91098235657054c49c46829c78019 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 461/466] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 5f249f2bc9d3dc1b093bf74d0e5e1dca2ed29aa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 462/466] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 044e9bf8cc34e2de516f5ffc2c91d89bc0efd53e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 463/466] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e9fc1df850bc691b8a173c30fcbb52e0e5f7e0fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 464/466] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84498596e21..3196300abde 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.18
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 3c275b1ae3d0637a3503cdd0707bc63dc8ae4b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 465/466] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d3b37647835a263988c69b1b3e07e67fabd6c238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 466/466] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [ ] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [ ] why not remove the outdated libressl workaround from qt5?
- [ ] should be able to remove the patch from lftp
- [ ] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [ ] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [ ] why not remove the outdated libressl workaround from qt5?
- [ ] should be able to remove the patch from lftp
- [ ] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [ ] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785266067

Comment:
>  why restrict the openssl version that ca-certificates depends on?
libressl provides a higher openssl version, this is to make sure that it won't be satisfied by libressl.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785266067

Comment:
>  why restrict the openssl version that ca-certificates depends on?

libressl provides a higher openssl version, this is to make sure that it won't be satisfied by libressl.

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785268844

Comment:
Some more:

- [ ] `nodejs-lts-10` isn't changed, but maybe we can try to use system SSL now
- [ ] same for `nodejs` and `nodejs-lts`
- [ ] I think `rtmpdump` needs to switch to `gnutls` by default
- [ ] `kea` package doesn't change
- [ ] `s6-networking` is wrong, it should have `libtls-devel`

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785268844

Comment:
Some more:

- [ ] `nodejs-lts-10` isn't changed, but maybe we can try to use system SSL now
- [ ] same for `nodejs` and `nodejs-lts`
- [ ] I think `rtmpdump` needs to switch to `gnutls` by default
- [x] `kea` package doesn't change
- [ ] `s6-networking` is wrong, it should have `libtls-devel`

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785272003

Comment:
Should `xbps` be so late in the commit log? Shouldn't it maybe go first? Not sure what's best here, just throwing it out there.

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785272003

Comment:
Should `xbps` be so late in the commit log? Shouldn't it maybe go first? Not sure what's best here, just throwing it out there.

I will try to simulate some update scenarios here to see if I catch anything funky.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785268844

Comment:
Some more:

- [ ] `nodejs-lts-10` isn't changed, but maybe we can try to use system SSL now
- [ ] same for `nodejs` and `nodejs-lts`
- [x] I think `rtmpdump` needs to switch to `gnutls` by default
- [x] `kea` package doesn't change
- [ ] `s6-networking` is wrong, it should have `libtls-devel`

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785272003

Comment:
Should `xbps` be so late in the commit log? Shouldn't it maybe go ~~first~~ near the first ones? Not sure what's best here, just throwing it out there.

I will try to simulate some update scenarios here to see if I catch anything funky.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [x] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [ ] why not remove the outdated libressl workaround from qt5?
- [ ] should be able to remove the patch from lftp
- [ ] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [ ] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [x] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [x] why not remove the outdated libressl workaround from qt5?
- [ ] should be able to remove the patch from lftp
- [ ] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [ ] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [x] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [x] why not remove the outdated libressl workaround from qt5?
- [x] should be able to remove the patch from lftp
- [ ] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [ ] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [x] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [x] why not remove the outdated libressl workaround from qt5?
- [x] should be able to remove the patch from lftp
- [x] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [ ] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785254785

Comment:
- [x] openvpn default builld option should be changed, the current commit doesn't change anything about the package
- [x] why not remove the outdated libressl workaround from qt5?
- [x] should be able to remove the patch from lftp
- [x] should be able to remove the patch from turbovnc
- [ ] can probably remove patch from virtuoso: `remove-openssl-version-check.patch` and `ssl-connect-state.patch`

---

- [ ] should `libressl` be included in `removed-packages`? Or is this likely to break something? (probably is, just mentioning for completeness)
- [ ] why restrict the `openssl` version that `ca-certificates` depends on?
- [x] catch2 commit message is wrong, patch wasn't removed, just renamed
- [ ] tagging @ahesford to confirm that `python-openssl` doesn't need a revbump

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785282405

Comment:
>  can probably remove patch from virtuoso: remove-openssl-version-check.patch and ssl-connect-state.patch
Nope, they are valid for both OpenSSL and LibreSSL, removing them breaks both.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785282405

Comment:
>  can probably remove patch from virtuoso: remove-openssl-version-check.patch and ssl-connect-state.patch

Nope, they are valid for both OpenSSL and LibreSSL, removing them breaks both.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785268844

Comment:
Some more:

- [ ] `nodejs-lts-10` isn't changed, but maybe we can try to use system SSL now
- [ ] same for `nodejs` and `nodejs-lts`
- [x] I think `rtmpdump` needs to switch to `gnutls` by default
- [x] `kea` package doesn't change
- [x] `s6-networking` is wrong, it should have `libtls-devel`

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 579533 bytes --]

From f2d624601d2c76fc7356f518959ac60ef7da0993 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/465] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index a3c5b5181f9..28b9f112852 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 9cfc0e24fba7cf6875529a21e07e51d7f027222c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/465] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 1720bd0fac39d2eac1841036b13ae09ae0acf1de Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/465] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 29ce57674484c0388ca8730ab6446ab0bc693fe8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/465] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 66f3fa10b1a7d25ed816003af363d959e2d44224 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/465] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0147896f0e6334fabc6818b79a4750277cbf98f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 006/465] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 2430870279a3a2daebde69df0b9e6f13031a9b01 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 007/465] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 87 +++++++++++++++++++++++
 8 files changed, 209 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 28b9f112852..98748587e45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..87442ef8d1f
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	conflicts="openssl-devel>=0"
+	replaces="openssl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 80587a8280c02c0aa994de2c0d8485cd853d0cdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 008/465] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 98748587e45..9a9fc6dc20c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From a5af5d68c9d3cdb84402eb2300a8b0c19f63e2a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 009/465] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 95229cb1f1e2b60be607afb46af1a967e0a2536d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/465] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From b5a2c7a981e94b06b2308f57d9bd346f730e4a99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/465] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 7c878732913c53e86d48c39c8913a7d43d223980 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/465] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 878f5165d783e59738728c9f8d56c2079b33fdd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/465] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From d542902736ba7a92c2b809b0a73aa158fa608fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/465] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From ba2e701ef199a53b3a17b69230cb52b266ddad92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/465] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From afac16a7e25d0ca647ab1745df1ebb9d0da05422 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/465] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 1ee1889cc8271fea7ea68ef8fa2b08df53718d94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/465] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 94dcc7eb2eec8eac32572fc4bad58edb22dfe172 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/465] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 2ea63c5b7238c52450a2a78e3fe4735e24cbbc56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/465] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b67bd8aa3e192b574cb52ec0af1f927846a3be06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/465] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From ba173b0b19b0e1d3e7d50e1a0594b5c4ecda8a05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/465] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 50f4f2740d0e404af9a3ed0e1ddfe17190f2171c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/465] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 57e61608dfe5979085df6945ddb77b813c97671d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/465] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From f7802d3f92ed49a8008a9703fd097d2c1f6872ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/465] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 8c167d10433c7c8e0a9cbaec6dd65a158be8b4d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/465] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 61e073e6527853486ca6ecfcbc10fd0ee64654bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/465] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 5a587f8442b715daa229fec89729497a586c158f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/465] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 176c543ef93fac97da5824f3f8e30aec75e6617f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/465] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From de75bca0261f8f77fda559a777aec55422dc5608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/465] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 54d3c435b8b33e94a563853ef9b072b318c6d21d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/465] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 7ee36063562042d9308ad8e7793181abb35553c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/465] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 8aa741f461780479a90df639dcd5c7b1192fcb32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/465] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From a4dbc628a3236410b5298e79628d8951d3c32356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/465] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0ab4609eee104fb190fbfd93a491e9a3d91d997b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/465] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 17f6bf7914e94a21a74dc603468a66c688574da8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/465] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 94036a9338aae0442b548dcc02b73270b487e51b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/465] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From be30f967b4af97a37ba3f1f63ac947db3807dd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/465] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 748215e354d471ef385d7dfe8ff5365a27305510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/465] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From ee8ce2a69f1a247afaf12b030d7243e24194d112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/465] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From d0b486a6d4e7b86c8dfa5f4b850450a553e83914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/465] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 00f5a619a45e884702028896823895f5299182a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/465] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 0cb9453bca8dd57d6982cf333aafbcf6708ad252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/465] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 758fb652f2ff874eb931bf5bf3affb14c41095c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/465] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 98006964ad688f4266f868689599106ca58cd79b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/465] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 78cb46b079487d5e206e049ebb3203d811ced49d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/465] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From bc6b6dd3f1698e20463483573f6bfac45a38f21b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/465] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 384873403086d82930487c7985a1be062dada6e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/465] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From df9b5ae578514f11b34c41d892d92650c9fbf427 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/465] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 808e52b57ecbf57aa4e2506012a0f46f4f46b40c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/465] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 9d4630624fe9bf965a5e23b09760046439e26b50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/465] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 7cf81deed176de6981c11e2e5a8d70174f23dbe2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/465] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 696fd39e80fa19662a3670f6947e034dc247d93a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/465] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 9030e57e2bf5dbc4ab1a7c3ac4c232bef965684d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/465] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From b3d15d40a1299492f34679bf58b21894dc6ae145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/465] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 2a2e0f2131713224f6e9070a6347ed5cc3219d21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/465] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 201b901dff492a19d26376ba04166eb0e4d1097d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/465] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From a897e3ae315a62f098c4f38fa80558d368ba96cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/465] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1eaf5c6367eb180a874af1fd44f14b37fe1cf72a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/465] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 98a81cdc94ca73e00645c0ee1872fec41077d967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/465] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From b56d3dd1e017863c7e36d4e7f0fbc33c51bd9ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/465] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 49fc97e8bfb74c41f32e581b69b6965497cbb5ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/465] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From d3b8f838d906bdc69d6b6c970aa1aa6979e4d47f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/465] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From f69cb5441cc15f11acc384973758a037ab6cda96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/465] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 65b638b92872b7c0bdeb96e81fed9636d338e514 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/465] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From aa0c8f50e4f1f80a84baf4ffea27b7dbbc9bf80e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/465] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 6639940cae10375f64d7cc35985f1f420fe99210 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/465] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From b7f3b4c205d2fbd1c77f55027828b4fa1b4d423b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/465] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 20cef3498a5b6a919a6523a214b3b5bcab859416 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/465] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 7718758dadc2eeb3215090d73bc41528e24c1a90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/465] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From aec73883ff83b8e0db582bb8ce426435e65b2a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/465] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 10c6f4b7c49c4fc45cc4ac273e3f1aba8dab39a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/465] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From ba85bfdfe41adc2c069496e281cbb1bc5d7b40d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/465] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 62cadea4f4d62e61f81ef76ca280ecaebbeb0dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/465] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 960668705519c77d4bc0ec4429c915863be98c22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/465] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 5ac91191012c4546136122ac9afa92b9db9f19d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/465] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From c674bfd8c49935ce76a548351263c27ae1cfc14d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/465] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 2d6efec5cc7b1768272fc91d4b8e1103a78bd5fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/465] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 3e2fdfdeaf4d61ea037956dce632dce0b5bd614d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/465] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 7ef6546295e7a27dabeceebcc0278890abc69402 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/465] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 86907aef3dd0619ad090eefb8cbe41bf37895d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/465] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From a4c9d02a86803ae727c4a4c9e0193fc12fff4183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/465] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From a9dbba1c5d886ac179c1a169e489dd102cd4f172 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/465] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 7e1d66ac5d4398056df7361811be3dcfa4f1d730 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/465] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From a9c55faca3f18c154a0ade6b14b98855facad31c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/465] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 6c5973ca1e16cca4d3522cf60a4f37cc39f9a9bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/465] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 008bd2b4feb93600c22b4adc36122715b6026bbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/465] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 800f0621c535fae6722cfb54a90e7b4b7d756d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/465] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 77206b7a0231d30b9684863223eaefd5dfd458b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/465] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 81122d9a085767c56f8092dd0cdf6c9c5065f994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/465] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From c07d4d748dbe75609c36cb316218cae929330d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/465] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 73c20be7ef8761b7d77a8e7ad86baf164bd31479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/465] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 190a38394ed5233cde16b82800c036e22facb459 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/465] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 81b3e3a548428794e9bce3f1e269d8e869feca49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/465] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 16d41435c2aa6f9af6c72513ca5fc379cf61bfe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/465] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 4f7221f04d7f05d2b226a000d47b35685491002c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/465] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 947ea1d00309299b046df00ad8e9d6415fa9d7ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/465] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 1d8065f677e0d0b59f153ba04f21ad3c4508e050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/465] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 85aad16569de5bd268ef23ebf4693af2e016cfa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/465] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 2e90b9a10d403915356a2ec612f2ce827fb89379 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/465] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 1ea73877228a13b3e77cea4a3ac23d8b137683ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/465] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b2a073f7471c4e86b05cb1dd02adbd5624d7b23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/465] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 81b850b7d96371140c1bd7cbf57401725f88f71f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/465] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 1e12cd831d3d6b09e8d1359b3ace4a61f4a45b51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/465] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 806b0d706bef1d23d53ba74b7dc7cb7445f5ec13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/465] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From b3569b4d55d9f1bbf1def4c5ce5875cc839393d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/465] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From bca7e9faadb4caaffcd29701f44b7df8b90a4d25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/465] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From c309f15ae0da3379cb972b41172b6f940b5d8336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/465] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 224e2e56dd8767b49b04042b803eda63741892a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/465] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 0267b29142956f67713dbfedb4ebf2be9b09c689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/465] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From ca3801770b5054ffc5c05399c12392b63547fe27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/465] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e160dc50643d86e9d519ef7c1fc68812829f26da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/465] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 3e7d9afc62dc728c90e61958d6c1dd14688de844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/465] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From dfb9f430fe3fd6e6487b3f1dcc7e39c58459d52e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/465] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1a27dee9dfaa0de7fa11ad71541d4f6fe2fbda75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/465] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From b6e83eb2b21f57e6765ea64681ec21e1e9fae547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/465] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 6fc3230bdfa5ff38e763df2e6121750ec94abd93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/465] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From a49802e50e787e82ecc4b5032f9fbbe8a6c4d7f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/465] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From dff15204d31075203a642b8f13ef4797675a7377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/465] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From f96fdd3d78905751833f30563c8280ebd6f4e68c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/465] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6a2812c54cc90c90e2650fdc38a3dccc605c7e52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/465] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From db0e6352978e1d85935cce702d06e2c7aa32546c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/465] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From e97d1220297fcb935839d3b158525e5c34738c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/465] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f87eb08d44017e28e616e996aebdcea505326d2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/465] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 20ed2c75036ec7556f1cf2ec707db67b26533f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/465] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From fc1c3f535d829443f99de79d81bb311c54df58b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/465] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 6fa3b133c2340a6579901b8b032ace133406fedb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/465] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 1879db886a09d06a2f24b086d175d08912ce6d1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/465] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 0dc5161f50e3772b9025dc4265d89866599db6f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/465] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a23000646729212e2f13818c2e3420d942efa82d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/465] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From f32dd86ab5e7220276686a5ab8048069abac194f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/465] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b38dc26c793099c1142b9b280d5d34fcd48ef4d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/465] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 3f57c068d4c256530dbd416cf9e701d687442e79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/465] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 2e24aa9dafd89a7c95798642f368a15d07cb6768 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/465] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 9155caf8da6d47b8b6bfa9a69d49858fa29721bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/465] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6d556f69babe4cc9c5a54fc630c506591c3ac6ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/465] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From df9bb2f5a193e9f8dddb5792dc6e134bbd4a6bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/465] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From c4e0bc2af4eefbdb4e3cef2c7355f35f296e9d49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/465] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 497a86ed4753cd1c28b48319b2dc6f7c09211607 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/465] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From c7ae00b117532636413b69f8c003338db900436b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/465] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 140909faac259e34e7222c394b0367c8ea6e9a4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/465] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From d7bdf867f115a4bc88e5ad1ac8a442d5fe3cb443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/465] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 7a50b970794e78161697d672c0b7436496fa1ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/465] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 5d89840b29d4d404a1ab7a0ea4058822c9111c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/465] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From c9f54d761c2c2dfaae5861b880b16fc8a53cb29f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/465] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 427a7651e5421287595581d741158012eab02371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/465] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From e0f1f0d9afc0cf37b0647097c68e246093d77c4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/465] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b5e87b7b5a0775dbd493c6ea244692d9835722b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/465] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6450d807114bf0100061c620ea1880d6b555decd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/465] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From bb25a7230b9475f347d3e9fda76ce9492033005b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/465] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From bf4c9b40b417453cb0a35114b9fb124d0f4ffd01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/465] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 6a65fbe6ce8bdc0f07111a0e00c56ccfd47c989e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/465] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From ab41da704d627d914bc601b0ac7d877c828fdeb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/465] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b54160660ff9415765e38bb39ea1bbacb0552e0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/465] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From dd826c0fe42a1d2db53507ff096441f858eccc56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/465] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 7e52845d4cacf29157a8e60e481c6514103c22bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/465] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From f350e1fc5953b5ebbb3dcbb3db5ecf61d3228eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/465] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0a80e046cb883c1220195af529f4026af155fdc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/465] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 002db2fb15022db999df6df9811d252179f0cb38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/465] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From a1e3ef702ea0fdf4223cde42fcbd4df52bcb0823 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/465] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 48b5fa7f58449765f2aa6e81da75480ae589fde3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/465] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 61a718ce6864d62790de7b41336ef5eef2300ef7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 161/465] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 2229ee5f248a328ca976b47375a3d125451a5fa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 162/465] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 254f4d54a9bc6a7f90bf2f2103ba5169083b3551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/465] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From bd9aa2353b1765ae6831ef78c0a4268181c34c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/465] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 7d138cb1a446a3ae7d7cb5345b528f2f0e029ad2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/465] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 67d585f5a361a2d571efa17eaed2ead1660fe8ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/465] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 7bc1436f454ae4ad6a9373fd14dabccb8d00bf7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/465] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 94bfaa0dcac48bd1f5eafa432a0ef89ad85fb18c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/465] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 9a43a91ccd766bef5c8fde6cffcd20fe6ea25602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/465] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From b7c01269b4e9e72b97b34a4c0239fa9e9bb292d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/465] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From ef041849bf1a0a3fc13ea8f55079c2dbebfa83b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/465] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From c60f79ca605235965e2469b3330bf4a30f5eb3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/465] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 0952269a615d54758542162fd615e7948f33ce95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/465] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 4e77ef4c8394e5270c6807d901862a8ee0ad147b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 174/465] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 23c28f4314805ece45adeeef85a6dbce621fefb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/465] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From b2892050ed0d94a2261b5fa09f26a92d3b00a715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/465] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From beec1a290491913b839c424c48e138a544287828 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/465] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From fb025a336f60a5a60d88665030eb65a29afd30b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/465] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From af66e02302363eac69ec90764746485b732ab72b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/465] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 47db60381e4e9a3e73d6ee6316f30289cf4ef704 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/465] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a49d37e55c0fd487467c22649ad6667bafa1e1a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/465] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 7d65251b0e69b85817a2693ea8309a42eee475da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/465] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From c298541943b3745d75fb8e0eee349c4431e0fa32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/465] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From d1a229bea256f8481681fe2e06ba5df6a6a7a09f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/465] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 6759beb944445b29b920701ced15633566765966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/465] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From b07d082eec8424e530c24e085f6140e907309453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/465] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From c97d86cc1962d6637791b0957d2c1a520cc099c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/465] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From ce7b607d1949aa478ce663ada0c1a64d15f75077 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/465] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From d72fb61e3b065d582eb50840a407275c4d66c7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/465] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 2355617265cba60cf1a786eb459b3a76a80878c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/465] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 0ca2b71d75208daf8e5131288ca3aa8392db2f87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/465] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 425e8784c311d8ac048b7b2f3914246219a1bba2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/465] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 4ceee17dc43f3ffeca535276fa96b639687058c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/465] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 898d9f4e9422a3210cd6d19eb0ff5ecffd6f83c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/465] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From fe281e522e694e852be87071d7bf6e3975e45180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/465] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 7fa3f773bf130819440ed03cc9ec443ca071c6d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/465] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 00abc1bd995e2dc6236ddfff54b699a5a7a1de48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/465] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From b2e42dfbe5aaf69e5c1ce1e5276bd51972c74a63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/465] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 3465b07f0fd1b6ccef9368700774e6e64c00a1af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/465] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6b966244e0a6c2396a3c75601ade8585a804a903 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/465] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2bb1fc90375ab168cd348dc542bf8c541534c2e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/465] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From a123fe8109b0a0dc07f85a6c5b581125b3f27ef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/465] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From e9f58a19a023fd752c0c94909171f07aa640ab86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/465] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From f9229ec676d9870043f27b92ff8dece44284272f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/465] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 52e42f7108a909870e4f46445e9374102f288cf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/465] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From a4b2ec18e3898164cb8354400d9d06659feb6a83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/465] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 5f03c92b8ce673535a8008061b3d9ff419b0392c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/465] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 83aa45b182082982de3897e2410d23581b0af1cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/465] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 588244f5c797eb6a1d43d742b05f50b0d7a70452 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/465] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 647501a899efdd88b2dce299c91f5bee7f941df4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/465] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 718f9fca5c5e6b49672017f73d760bb361ff0731 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/465] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From c93bb26602e43c067c3852ef87a2343dc1f859ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/465] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From df8f5325c9581825b806e37493178f21e2a6324b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/465] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 28c38646e2575113de41e09db64e783718940f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/465] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From cb9d7e38465758e4b36beab01966716099671a32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/465] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 7b67e01e17919cd9c9e940f59e005a1e4c202753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/465] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 57cc5feb281efa36e6c7f0e19e1fbd8edc351ef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/465] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 493216e0021a7a14708f2dcbee4a5775bcb14ff3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/465] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 54182ee43905db560babd9d79c2ce30a0532a676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/465] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From af8139ca7a1bfcd2c0b48f5acc3e61e7253a0ecf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/465] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 543be9fc3f78cd2b0d4136d3e600e480b7788acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/465] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 4fd2810a0d7b6a42152a6a0c53ca08b71ef97893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/465] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From eb451add9ce3b110b9cab6d2704b932d92b808e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/465] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From bb93146943d15d8271afb6e74e2beca1baf2214c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/465] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 69eff8d24a778faca95e55011b093d1c539a7ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/465] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cfccd909ec6901f6420c0cdaa23467a852f385e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/465] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 44113b3de86886f55febdd6a862ec2cbedb67490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/465] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 8a0932955e14a80c09234070b342da407f5ec954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/465] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 90e0a123ed3d504676da616625e90a2147176a93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/465] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 4f3666cd2b461a67ded0dd46ef7b3bde025b9c01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/465] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 1f881fcffa8c70e915b5374221e90bdf8786de4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/465] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 5ecb7d063ae3888a29591ec6b132b3bfbe1f4017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/465] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 0d92b067351e5010846801f3506bb9b970e8a52b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/465] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 76a2fde0c86f7689c81a8c192ad2f81e1d4c44b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 234/465] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 2c085374aad708893fd48b681401c9e14fd5e20b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/465] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 5f0218aabfe15cfa9a9c2d0a7034bae9dcf8fb5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/465] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 48676581b817c8c572129aa1645ef68af49ce8ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/465] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 7eaa896edea7e1f2fa3d73fde6535e9585ca7902 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/465] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 65ad3cebc94907a37b7f5966c9769948797bebe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/465] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 72f8e201c16b3daf980d91331738b95dde39baa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/465] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 7a737138069ca7d5db1c51ce09450c5509e5fcce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/465] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 78e5d817dfcc1e45c8c936c2e717352298c990fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 242/465] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From d611ebd5d83be42c3bb643d61f0a0c7cbb31a1f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/465] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From a2c1cf3dfd9678937f78489fe08b08df4005ab8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/465] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 4b1cc7dfc4dcc0120ae70ba9226d3f8e9bbf2403 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/465] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.7
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From ad52ed5bb0688941d2c0e8b7c9f49d720f8baf20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/465] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 8a701d1d12dfb6a10d9ec3bf016c15591a840e55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/465] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 46f0867d0206db0dac1e9acf35b620f07f17d5a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/465] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 19a4f119712b51140798a601a956417d8d836213 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/465] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From ee9b75a2faa88a8e8581286030a54a5f50ae21d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/465] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044..189d0da205f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.1
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"

From 9731a53c9e287585d06617b0cd9827b69a2b0a93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/465] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 146fe1407c05d4ddeb71e85d3deccdc4dcfd1004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/465] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 958c316a349b90f551bfa9c6a3197dece9c04b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/465] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 1f126cf027bbd147216f0e483dff5f93cfa080a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 254/465] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From b6db2fb5a09613b0f5de38341184eb3ba16a660f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/465] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From f656a3d14cf9dcb126b2a29997679a9191604da2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/465] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From f3934dc43524789c60003ea36db583f332667aaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 257/465] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 0676ddf0efa2e658e40f622412434312a6aa36db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/465] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From dc0b63729b12d44ddf3a895d67b793c9e9020a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/465] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 09003ef54cf1d241549eaf2791bf40db55e71673 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/465] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 0b53055bc0c8a7e33a9b13b26ba8ed5e7dc45fe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/465] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From e78957d0a88f62b21ee59c814f1a6ab1e5fa9bdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/465] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From f9dfecedf20d97e606f46ad00489efb6d2dd832c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/465] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From ac8d55ffb35f413faf0d967e58274482b9f4379d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 264/465] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From c4c89b28906bf433c47e96e04427ce13fcf38592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/465] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 96dfd6c818b76f3285f690a40417db7d9d751017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/465] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From dba532620d92ceec91d3acac9ce74ee514406c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/465] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From bfd25e3a2c9d6e3eade900071493a021714d1f00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/465] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 6d49dca312ed8e9bdfcdc22cf3c6cf5aaa3734fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/465] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 85a8b5a2ff5b4221283e7d344f7fa279de84a49b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/465] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 4f166c80c5215c369c904254f2118527e79598dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/465] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 95fd43603e7c69e2018925d2d95390f637327a95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/465] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 451ac2bfcf6f7a51a804964eea9c861e48feb5c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/465] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 59cd5580e743020d33b4f1febc053567f5a99e98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/465] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 9b03f9e8cec494eab5756599421f7f3965c1c8be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/465] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 411df0f65c433ff812205b2ccaabbcc5f2c56fd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/465] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 92973b4a47b5994098493dd0279a1317d332276d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/465] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 6e4066d6b8e07375b84c737c6f1e229425bc8290 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/465] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 18891b153fd246bae9ad91441fb3a540e4c9f548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/465] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 254b9fdb6d192e083b949e13121dde2c1bed8ebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/465] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From caeeabb2a3d69fcc82c0b83912fac26d809170fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/465] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 62116cc6f3bbc9004b963c0fa6d16ea02478dd46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/465] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 14d9244f4c24bfc1ab757ced9562d1a8496f0cf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/465] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 35200a1e7ece34e366d1ce8265aba5da660adc17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/465] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 4dcaf367614f45242e6db287ca4c37b3bec4b0c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/465] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From efb9470953b9a7c2ab627f279ad228fb7469e841 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/465] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 65d127b3ed3a8a8813e313f225944d7d1615984c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/465] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From a5dff2f3a0581e014160d0c7d781ec888ab958a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/465] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From d7d959a1317af4276030bc79f5aba155a3838f77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/465] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From f20a435cb8511881036bf4775cbcbea0f6b4202d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 290/465] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From ce30ac6e00169e67d6e7870af22aa2b60b560c27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/465] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 9ef9bb9ef57d05dccd8c501871e6271fe4f55a23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/465] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 9f059613ff14876b375bdaef470eba53ef09939d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 293/465] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 74619c9b6981bf9db38254ecc972da8370ae68ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/465] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 763af4d3fb3b6e9390eefab40522a746d86ede9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/465] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 62ef3cc0e887328fb954c57f20d63473a2cbcfc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/465] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 221ab762174a831c90ea005a717721ab10999f3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/465] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 3b20f72ae7333610e194fa53bc271deed254ba9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/465] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 77238c96f819306c6085e038c0ce19b3b58b0538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/465] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 43661d59c94201cd13774c35ba536b99482290dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/465] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 8cdee456b1bc9daed47e944b4c1c739ddeb89937 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/465] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From bffe060ffddc0e7bf36bc174531eb32170dba8ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/465] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 16fd2ee357a98283f9aabb18873d2b29ee44bc96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/465] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 1f1bf17540cb75e4abf5d1c0ddfc20edae29ad9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/465] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From e8e29346cec0b4ae4cb74ad37c1c1ca52af31f57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/465] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From a2eda19ea8aee7b854250ec8e7a53d799575f759 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/465] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From b1f9ca675c0aac23f2e17c04e3b72ecd849d98af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/465] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9e2e6574c60bfad7a9567b7af0390c7104846c00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/465] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 086bd2df1bb78600d20d91fb9921b47e3f464f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/465] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 156d80ed8e27c5dcf7bbf2102e5b3e49be81fb44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/465] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ef78c7c8a586318bd386ff7aa51f841924b55d28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/465] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From f2bdafc921e91f7b0fc5c44f975b4d158d362106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/465] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 911a603e9b9c2d98cedf0ec5ffa77c39a8e298f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/465] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 45db42c0a870f5419f4fed3c0d84cb63e0b3657e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/465] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From f71d366d5a6a41fd9adbefde0d53d031bb336c17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/465] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 2a2cfb87afd21a14129cc2c08b8877769026e59e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/465] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From decab993119eef9155d5cca946cbaa273ae5d9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/465] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 2ddce877071a72478f31965cc019630cbb1d58ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/465] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 7be81eae14985077d7b37007665d2f06f2d93256 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/465] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From ff785313411f9e27d0376869c0810b0a42736fa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/465] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 321991af62131996c9409eb6ad8ad04e1112e327 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/465] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9820f7f9ffbc55ad29072dab2f53bf310070f64b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/465] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 7091c100fdcb663c0684eefbdb328e1c0921b058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/465] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 7e576b6de94f08cc9cdb7245a8a393ff761b2ecc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/465] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 50b2ee4eb33c5dc9164825bb9ad8aa5868256c7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/465] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 218a210003097423aa34918a39c5720568e1130c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/465] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From b218e343253578277f5c6664b3879f6fdcda5842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 327/465] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From a0d6d2a01446d5c615576a6ad510c2ee6ef54abb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/465] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From f792b9dc4fa9d90e1bcc9cf85a07c6344eb25720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/465] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From d9b465654251f278622dcc462f805f396321062b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/465] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From fae7172caec56e8157ed144710fab8fac3b1c5a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/465] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From f9ed978a6321b7fef72696c7337f83052a79e299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/465] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 3c63a02efd4835fdf3dae3d412337815dcc0871c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/465] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From af12447bfa1c4ff9e03e65b9d3713d2ac2ac34d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/465] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 0e44cfdf1ff7bc1f19a71220cd8337db316daa5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/465] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 13b60f97333c71932ecc6e435b415895b9764592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/465] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From dd065cf10e9173b083c3a24df8ca4333e8575aa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/465] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 73dfaec146ff7902b06e81bdaf8b12ae03844715 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/465] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From e6ba308b8e69dea8cd50369b13442502d95e3dca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/465] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 455ee0da568d751f1f9bbfcbc49838e73b4e2f85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/465] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From ecc7101da82f2749b76f878027dceea38071dc3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/465] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From ad6e8ef856a972d2d670f857be6ac21cca4cd878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/465] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 8cfca8c7c7957e198a017b1ac2ec83072eee2c53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/465] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 322c703834e27047b8afa5a60fcbdcbb089947f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/465] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 06f53f17115b9a4d079aa294037aa905f192e8df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/465] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From d6b09c3a1ce4c75f5bd11b6a78b642171bf21116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/465] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 7b3dce216d1c9ef67f0b0cded5f7ed5fa061b00e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/465] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 204c57654627bda46d74813c9b8e24485072fc0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/465] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 9fe3e184f4822c28bb73fe55b69f7f1cb65d3ffb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/465] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From bd902b615febfb9b4bbf35faa2a4036b9f86dfd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 350/465] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 67f22fda12c320f4aa23431d7802d6eb1108cc4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 351/465] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 049d9abda1eb303c288a6bf183c6ca8a1b434aad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 352/465] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 3dd9ddfa20c46c33b30af353e2e77fd7d76b833a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 353/465] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 5ee874cae1d15a7b40ef4e8932fa4e126db7331d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 354/465] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From b5bebdf45ef6d5399ec5c1c1a2cdf7ae2e2b76a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 355/465] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 5dc4001f7f6ba0275e817927e93f1e021cf1f714 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 356/465] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 5c0db195a9db2505a0d72825e93ba78ef602c2f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/465] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 0b5b6de3cf7657a1150a807c7ff035796fc3a55d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 358/465] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From ead06ab38f5a0166a3e7384e8908a452eff6058d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 359/465] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From d33be22665b3a9ce0e0ff80b3551ac5da0ddaa25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 360/465] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
 _dbname=wireless-regdb
 _dbversion=2016.06.10
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 64fdd6b8bde8aca6313d8a7482b169335518ba39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 361/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 4eb70b3b62a61fada42f3e6968f966c1caf3bf3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 362/465] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 692cc67a7efc3e8b4c4191bfd48b6bf5c91139d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/465] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 22cead471f5314a8fe32d30595d7f3f1b83a20ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 364/465] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 4c5401fbdfb213521b14bdd54b8e33d1eea3aac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/465] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From fd1aca4a6e0ed11c2db2b3f6eb9c71b8ca2f13a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 366/465] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6e56305f3755260330ca5c56350026fa1b0ad2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 367/465] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From d7f65cad1fe45214b3d1cf3d45947771deb7d869 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 368/465] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 012c4f968123e52844c1e9a2bc67530c5ce68c1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 369/465] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From f77ce0daa8b2eca7bb759679f07143360c0f1348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 370/465] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 8120cff5d7bfe4281860bf09ed03fb0fc556f646 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/465] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e35fe6ae49d241b2215537759c980dfb5276658e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 372/465] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1a862ab1a5dec3b46ba0f210a8987c8fe73e8603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 373/465] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From ffa7f3daa55b6430732c69307393c105d2fe43d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 374/465] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From b8aa8519ba536d7aaa56bb16bf85e63d3106fc0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 375/465] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 91789c96637cbcf6224a3a4848d3b36cfd1b4b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 376/465] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From b60603133924318c4abea317e3854b66a1a08f9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/465] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 1f31240371a5e73b5d5f69219322cd3eeff8547e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 378/465] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2cdfa985eff5b632f3afdd97f1ccced4a5f70f13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/465] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From e6a1e9d8412a4db1dd574223d362a57a5a2f48aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/465] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a5091a2c1b23ae7a20a1d2ddf3575fb636e50324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/465] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 3382ee6772bdf599189bc43af51e963f19822eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/465] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From b2ee89d2c9c521997ca9bded0b71e39cabfa6ffc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/465] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From c17474f26736fc2950f936ad3088cfee81c0d787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/465] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 8352ad58eb006764870154e6c37d6288b689d595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/465] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 17915195e7d75bf6dd2535c0f4a07f4effda44b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/465] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From ca0789deafe18a68ef5e76fa05c2f653732a3fc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/465] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From a03079fbfbe49a14d6e56aa6e137b34a5c095eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/465] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From b4d090f7d3ba2c9f4593e47ee667c925e2f9d319 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/465] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 1e65362dc981bb7271bd90ba13df8ed53c0561e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/465] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 0a69fedb6fc6327e2ce186f9c3c7fd699c044b83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/465] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From fb511cd3573ffb9d64bcfb6cc9bd5db1ea904c77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/465] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From eb22eb6838d0baf9a94f1695831218e9a9e10971 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/465] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From aa2029c620027478e313900dfc115d4a133e1601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/465] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 6d0fa345a58b2c526d7725b7ba82f858b7ca74db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/465] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 2efa26beec3a04567245e56030b70bb063f6b36d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/465] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From cecfe50f7dfd1fd72fd6accaf0895ef5f6b51794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/465] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5898d3a567de18e2100c8ac2b82a72225b6754f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/465] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From afb0ad72dc8e1adc4999daf5c3650e94973cf819 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/465] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 9280d34d4630137d013d9f12cf25639d20bfd3ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/465] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1954a9c374de1632d4b1afba717bad824b5826e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/465] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 50bd533e1d638df496954de0e7aef152192b539a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/465] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 52c49992ab24fa2bff170b0a0f70916f0c20f817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/465] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 16fb81fbb750e7a30dd2927617e5867a6d8d9058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 404/465] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 9e777e677dc67058145952e2127f9462aac0fc9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 405/465] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 20dae579154c8d6a5a36bb5b17535d4dcc302604 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 406/465] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From fd082e74b2c41e4ec695f64e71a33412dad5cca6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 407/465] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 88f75d07ba7b6825bd33776e1e6c0ea1e6332f5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 408/465] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 7e972f156c8b1ceff2853b8b900feb561425ff34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/465] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 179b17f20dbd1b25c0656bcddd87216a2fa45be0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/465] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From e5e4663d7992c4f3310fb9db008faf78519503e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/465] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From cfa3fd8fa652e3b414a9c3016723b0582b6f9f26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/465] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b27864c9d8b0132c3b954eec9639f53923bf6422 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/465] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 71d1395ab0db7aaf2982859f25fe39d22d01da27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/465] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 79cff45f9bbe1b930ae722d951456755a9f37c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/465] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 9d21328d6f6d6cd7d3d1d7c71cec9020551fa5c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/465] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From f64470f30e5cb42915fc54f7792c07bf62e45281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/465] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 601e7bce69e6cbd300eaebeaade5f327fc5baa86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/465] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 76d9f867bfc42f7ee0a978ca91e7ae87972c9c29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/465] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 6a613ef93707deea0e85e03a70f1785e266aae82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From eefcd6a039b6725f7412a905f22d8a0b4704af91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/465] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 815c23b83fe699e3ba9f7699a5844270e9352595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/465] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 8724438fccfbc4fc64bc04c7f4a8ba0c6452aad0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/465] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 881364b888952ca7980b870b1884f93df5d5b0f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/465] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 113258196855feb32db2da75de872effb8fcb8e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/465] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 86eeffd4b799226de2812801c641c4f4571d4121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/465] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 82cc55d9e2db2ff2c8f35ca471aa470e9b25891f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/465] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From af17effc4fff871c07a8cc0a694efbf3c348ff2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/465] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 069065b1f0643ade101816a67ea6ec16eb3d2a49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/465] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 379673e6e9cb98df0f34ca562c9c9b77d57bf6e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/465] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 15fe739df2f4d356909ebc2ab998c9b6dbf921d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/465] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 24d19078e68be9a60e764628ae18cd24d04e5547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/465] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 6ad5a02e304297d0ed40182f92b61b7f3be89187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/465] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From c1b2aa9d359ae820e60c94fb66de4552db04cc91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/465] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From d7855b1110f409f95bdc6398a1b7c62e10ff5c2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/465] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 51eb223f7a6a4e29b21a071636d1c3df72a5930f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/465] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 06daa2c4638ed44065239a6dce690efe83653b3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/465] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 71c1519d31d263d6325767107a76b60805b40e1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/465] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 17e198a7f57f8aa60dd4270aa7b9f685de42fc45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/465] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 7628988721593c04b4e1d5c2c6b024454b3337bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/465] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 03bb1921c9b26f2a20dd780c5a30330a9e3190a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/465] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 40383a40cf7f188df7109dd2596029a0d766821c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/465] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 759ce4d6e0182515f8139069f3f7958ec5fbcca6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/465] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From aa3718c5c984be01e98c21874bd331d59186ca25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/465] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 1a541bbfae9d1b1639ec37bbfdec4e008c29759f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/465] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 05dcfb3a2a6ddeec01300339f62721824260f171 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 446/465] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1fffef916e60f1f51bca4f7765878ea99b3ea644 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/465] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 110d1cfd36738d4c29185fb5953c7e24c0677f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 448/465] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 32857842abddc79f3ea751ebedf32186cf1c5410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 449/465] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From ca8bbd400343417166cac5866639d3f749ba66d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 450/465] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From e8617c501fe91e93331a1499a5fa2f3ce92a8ea1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 451/465] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 1542e8de306f1afe06d8b3040d4c63817e303e91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 452/465] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 5c3eeab7a5a0222c759e14ae05b7184464149ba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 453/465] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From b0a7820d91a410fee04cf0b1468177af95082452 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 454/465] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 4d6aa625dfcc93068a29fd1e3b888d98ff21a16c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 455/465] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 67a96bf698c4327c26343f6359178486e9d82844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 456/465] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..235917ab151 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 7089eeb2e00933c9d85849e77ba9ce48bc5b220e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 457/465] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From e86cd31bc11e64583fca0b83f9fea4db3912c5da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 458/465] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 59fea587b64f7830a0bb594d29672473aaddfa19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 459/465] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From b75ad46e10b4fa2282aa9cc477938ba11db72692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 460/465] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d4be91a01bb31182fa3fc8a8c96595488ec89cff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 461/465] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From cc3b05f3fdea6b5af33a15175c278fbfdfa90fff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 462/465] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 992738453fabf6110c5348947e8a9f18a7a1c4f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 463/465] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84498596e21..3196300abde 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.18
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b46ac062eb958910e0b10573ec3322499497853f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 464/465] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 742e0c460da9aafe57b673a4b5e81b7d3556ee2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 465/465] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785286845

Comment:
>  nodejs-lts-10 isn't changed, but maybe we can try to use system SSL now
same for nodejs and nodejs-lts

Sure, but this should just be done after all the rebuilds are finished. I changed to commit message for now to be more precise.

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-785299377

Comment:
> Should xbps be so late in the commit log? Shouldn't it maybe go first near the first ones? Not sure what's best here, just throwing it out there.

Smth, smth partial alphabetic order. Maybe I will do some reordering later, just need to figure out how to do it somewhat automatically.

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 579503 bytes --]

From f309c46462af8746f9daa0d638af9cd2a69af476 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/465] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index a3c5b5181f9..28b9f112852 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 2a295b73a2f1337bdedf5d2d65d3724406ad55cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/465] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 9b18911d27e7f52fb365290276591f29b0ffe5e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/465] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From f0d05da1f521e71ec49f4bead772fbab6baf27dc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/465] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 4f9c652b2c6c5fe7d5fd1bec7e442bb6351bf17e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/465] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 42442ac6f9dae608dff47e76d977bd7662160502 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 006/465] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 06fe7ec40dafcc7e87ccfa33b7c8c8fbeba92e0f Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 007/465] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 28b9f112852..98748587e45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 9eb7740470eb3de287b89045b34208eb5ca3c9c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 008/465] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 98748587e45..9a9fc6dc20c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 3228acdbe8a93aacb8012f4d27938e13cbb921b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 009/465] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 3419c97ec33b1dd345195311d113ac0478d77247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/465] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 0c3662def2a81b8f5bc297295ccc1e22b182a814 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/465] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 23765639506953a28fc375362784444398693a28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/465] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 4ee5b48ea4ed4d4a03c2ef7dc8549bb807429633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/465] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 568ebedbdb4b8d2f3aea95cff299c7280e7cac55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/465] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 0965e0867624b7e23e6ea4202679a100846b0941 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/465] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5537c1b93a8b5891db48f7b88089b1321ec61600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/465] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From eba5bfddeabdeef7cb13c7136eff41c5258ca04f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/465] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From daff600741ea51841e1c18b0c4bc02e3cf568a12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/465] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From c06d4cbfb6e8eeb84339ec8bc9b90769fafce529 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/465] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5125f47426b93ac1b237132c970efe538aa1328d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/465] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 3a7c8664a93daeee29781d89f13dbc2e4b5382b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/465] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From b852c8d1167819d813709e415ac5a1ac91a0dc3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/465] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5e682966887125921b2c2f1292cf1439d9b20c0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/465] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From aeb49ecd4e0c33ec7c1453682b2e2742fe92a4b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/465] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 002b7ebb662065095e9d8983d6e62945026034c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/465] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 7361b975a81a38132a7378c9c3ae8cce0b6b051d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/465] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From b04b3d47231199420ff8b75f7c02e3527bac5068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/465] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 8bc4eda8b8c51961cdf05628f6d16708598fd909 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/465] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From e004150a9016bfc82e5870065b17145ebbb6007c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/465] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From ae921f79640a98542062cfecf85598bf9c97e7eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/465] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From bd259827c0068cf13702e7d76990a9d5123a81a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/465] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From cde37615e93f4dbd71b6db1589192f245de34ce3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/465] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 0d6bc8e8c994024566d213d3f2d1fe9942752216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/465] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 7b81432d60f6c6c7112139bf986dad292e7e4e45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/465] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From ca9affc0f0c2f61ab2a7d4a32396fec0483f2141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/465] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From d9329ecd5678e316dd6bab5bc8a024581d544c09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/465] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 7fd49cc9391c9c3d6c1101df6e1879bbf7fda4f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/465] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 5f25fef27bf70d93fac445671985fb2bf8afffa7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/465] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 1c67137b73c47e23638d53e9b75c3dd5a31c22b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/465] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 78768ba3f55f9149e28fab9243533b10341d8540 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/465] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From bd4f0d02294b56afa6bee267a0fbc9f46bb5d52a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/465] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c2fc5e3606df52286497b7045fa7ff9c92d00c19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/465] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 3898f6b4e8643265dd0d952efe7f3ecb6567618a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/465] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 8bb15663cbfb4124f05a413493bab7d624ab3741 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/465] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From dfc21f8d616c44e612edf3129abe662890ee89b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/465] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 6fd2ebe712500fec02a424605a60813e800d694c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/465] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 9550dbc054299ef73bce2563dcc593f2973029b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/465] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 5e13ece274c18748a9053eacbe30cbfcd27ca0f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/465] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From bc918595bde2ef56a2dfb9308b027b152b22cb18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/465] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 506f3e87d541398782c285e3cded2bb0d268431b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/465] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 9077caa797dd1228ce1ac688196ed9fc9971bfb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/465] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 929b19a45ee628f750aa872fb262ae70a310f48d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/465] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 7ec41a6dd1032b439d4cf8581893c715d963e28d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/465] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 4d3fc1fe4387415d1fffdfddbdcbcaef32e74006 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/465] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From ac92cb89e67a50adac18a7a2b0a55623000119ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/465] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 6f4f4f5503a84731fcbfc3f6b55c25fa08c1b123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/465] dillo: rebuild against OpenSSL

---
 srcpkgs/dillo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From be75120cc4467753c3f6e5b4c395dfda75e4992d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/465] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From b9e101e17c30386500bd7d50cc6750b8135bad41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/465] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 55654e1bae95dbdad6721056c01d4c6211d24d9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/465] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From ae2d205d1c9ae17e2f2a8e28fa953d0c823aae0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/465] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From d7870d05953b7be6c4c900043f13e7570d496adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/465] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 6279687e175942edd3e7f482e9a458afe63f2b47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/465] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 5884d9275405ab171fc60da15f93b241f17fa3c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/465] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 7482206734bb080b6be7f35d7550215da027a187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/465] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From f26f4b6af956eb7e773f23c20a53368899843f6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/465] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From c3420030b19ad8fe3cac60bc0b7a1765b8772ec5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/465] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 6b3b9410b5f9ebc7532095c7d9847d46a4936a49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/465] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From e1d216df75990b82af1975126f224a46056180ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/465] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 83e8d08dd4d7f21c2e89770dbaefff05ff2e9d5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/465] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 888a40fb965341453051d28d902eb0b00b485bbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/465] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b61eee22c089ba762f3904b35ccb50962a95cfb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/465] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888..c4c0ae7ff02 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.5
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From d8915ddfb3cf47fa44f83321cc6c02a8e2d63f25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/465] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From f0e7410bbc87794788a14b41d9114cc31e44818e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/465] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From e241a7f508ce92c9a1466602019ef2861841eac5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/465] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From cc27f825de921649427795c92751378cff46aa42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/465] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 52ac118dcb5fc49619d06591fe6bdefb9b5cb7f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/465] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 6e81bcb3e2b3ff8b0a49378518a600ecdfa103b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/465] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From dde0acb16aac1269f830946203701586668b9a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/465] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 35dcb2d27c51931b620fdb7c69e892ad14018667 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/465] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From d32ea54fb04615115f8d7b2723a6730219eff38c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/465] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 037fa95b8f47fbcb04249bc77243a835b9150a7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/465] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From da95b141ccb1201dcb55b244d3cd8e95a96ae9ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/465] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From ba7c245fca610515512e13fa9460d96cadf312e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/465] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From d845dbbf3a6cfacc07eb198a772ffb01d7a2c133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/465] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From e42e3e01853a0d152b2d18e412d0c00388e1dee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/465] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From c4ef17710561eecc231f82a548f4c4543e3b2d3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/465] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From bd7d7f074eabfe8dec9565f329198f3d6f8ec20d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/465] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 919a40758c054b9a693883ee7a35c148b4d1ad49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/465] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From f93356d5c1abdf474a5c129c61b7f59de090c6cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/465] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a33957d451f7c9e1521ea7b05f29101f91a2dacd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/465] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 508ec1b298ec336dbbd9d59f85679ebe728a4eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/465] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 6499268df23cca86cd9ad9825d2a51506cf9397e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/465] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From e4d0c85d794a277a27571a386c9419f829e4283e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/465] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 1d33321943551e1088dd342e1f19534c0d9b8966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/465] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 931dff5f3225ac72aaf4c43ee49f6110e7e974e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/465] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b6205d752ab1c4e3587893f37ca28da8743dde32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/465] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From c94df563f0309843cda5956a67c5286fc9571d21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/465] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From d415295d36b4bf46de08f430c4725397b5d45f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/465] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 210da4067f6ab3b6d3039035f3a7b98c41b7627c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/465] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From f367ad750b29a0543073eca056ca5d85e131920d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/465] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0b2794440e447bd5cc24a6c9b28fb9780453d753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/465] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 3c1692dcce57aa0014848ea8223dd89ca8de67ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/465] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 46d1433d9567b241cbb9c0c8502f2399c3217b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/465] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 1c7b003ad6cf4c36321597577b7e07a69996939b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/465] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 0736333ae703199b19a6e8c7282d1682b914980c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/465] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 698c6b047c72dbb500ca96d0c237ad9ec58357c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/465] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 639f2063b9f8adc82782cc862fd3d0a92990f9a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/465] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From edc871040ee9370a53283767b8128dec58d67a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/465] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 1c1d2ee6eb64f48dd1276e3cfa846d37a440a393 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/465] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From b5a078f7bf7c367271a10220aa7afbd087875c3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/465] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c35cde4cf6ab5cfbbc7e95a4f672038d7ff06aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/465] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From c1c3a5d7807d717b234b3a4d486845676346079b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/465] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 2b81e20188f30a15851c301d66cbcfd5ce4a7fc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/465] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 091147e2f3d815d260f960556e9eb1c36b8f9afb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/465] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 21b10c5953579c9a6f7a58b0561e5f894119643c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/465] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 235b74e334d262651177ed28ce1914384638c670 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/465] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 12f2e33d1c731ba6c475c992ecff4845a24d46eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/465] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From fa86d98f1c474befeda3be587599056bfeaaed96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/465] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From f6167ec46b1f26987decfeb93a13ddadf1284216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/465] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 99ef5ac3e8691f887acfea7fb621261af44ad0f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/465] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 2a9161a0b8e271e6e4eba9f587d785ef437a3506 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/465] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..5df3c9bd7e7 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 69638c9a2ab20f734298c9ee22c587bb06c7c6cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/465] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7faf96a10a55351cfa0f86c986c70844726be187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/465] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From b8e7ed8e8808455036110dbb94e9e985addd0817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/465] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From d0b0a6a27f9cd521780f3817000a0424d23ae837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/465] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 6713de9238e1a616e68e5798c4cc77814a2911d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/465] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From ab8449a97e0b831856189a6c713543a3a37ae598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/465] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From ef5ff754fa4fed3f78138dd5d67a0932382cecd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/465] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fb187bfd267a6b761d1275a0c8b1db2ba3ca0cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/465] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 054f22707a244736173d162c81535698a74e4947 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/465] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2ce8009b189baf5474843f37ff7c895f2f021c44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/465] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From a4ed361c0f2760fd1b47ac3b3bd694dba5334541 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/465] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7e9b213a467b5fafc25c977de6d696613543c1b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/465] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From c7f3d78bc58b8e80aa34a334d1bba4ff80147655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/465] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 78a15c8c6ffd53ebe615dc59ffdfb8db54acbd6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/465] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 01956e0999bfba7ab246288d87317a7b8f158d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/465] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From ff2ccb0f4fa3ef8b4abb9a2736815b0f362ab7bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/465] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From f0748e744824eb754c2432b3dc4d8dd8c5ee9948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/465] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 169a7d2bc1fe3539a2c699e43ac8fcfa8f79b320 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/465] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7103e9fc17de78fb6004338b99745051f904ef3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/465] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 0920ddc95949dd16484e6944bd3599d6422ecf1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/465] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From dac3fad1881c77424b036ff5b975f3b2553ad757 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/465] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 5d3b231ea5a075f1df18a73d4ff301e5cfdeb865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/465] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 499ed4c5e75b1abb96e8d9807dc4c7a16610cc93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/465] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 9ae8687a915f7d33eeeef25b262961300f90da10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/465] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 07c85df2d5955662b33bf199c2e198b590a60460 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/465] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d08b76fe22d17aa7e99ea34e2232f6ddf2fdbeb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/465] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b1711f2d1fa557cb3d36b7019e712ac4f93f3a65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/465] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 0b7efde78c4f248d9141e6b484635b6a1ead524a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/465] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 2df20b4ca7767fc69034f3370a8c469aad33f2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/465] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From b9bc2b507d7beb6ce9ea42fb80cd89e6e44f6a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/465] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 9bae8754e132248b18414236a3c2bb88f437f380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/465] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a19471cb48b41242901efc74a0238e373de6aa07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/465] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 35f97e2c05ec718dd50b12b0f540a7e2d18b0d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/465] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 87ce36924ee96dd1d7a43fe77f46fdbaa0b47efa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/465] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From b49696156ea3a09928d68074b8caa9b23f8d300a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/465] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 15712520ae418035076eb66e2a7eb2317d04a03e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/465] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 5fb52148968dc6e9baf277f95be81b913d134080 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/465] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6bab69d18f50b7f3a894ac796f8c427c1eb49f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/465] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From a436ac376c63a694279083cfa29d90f52c7e2cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/465] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7c0fe22da93d055168bbff3775442a1ed7136d79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 161/465] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From e0a6acaa684359a7c6174cbf8439d4a4db8ebe66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 162/465] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From bfe41c4a495e59d56083d0b5299cee244ea379dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/465] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 43d38a2525aacb1e615abefc7005f490cd294d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/465] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From b8db9d6e81cd63b23d4df82d0f8b7398d953a0b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/465] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From c17257c2dde730e51c993b81e827b23eba071c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/465] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 93c24fcea4e89a6a88a65ed1a49eb34c470c4857 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/465] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From f733b52430354375c3a34489407266c03174ae3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/465] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From ba7205723fd0cde0d2b7802ded35e5dc909c3035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/465] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From a0662e74c21d0d4f8defc8102a6c905183205c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/465] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 697cd71a31c439abb06b76162911595a367c9d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/465] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From ae7f5e21d7a7224039c815b8205c794900bf8102 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/465] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 60367f179b1eb96e0807992cb78de8fe1391e82f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/465] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From d63b6f6ff9894a8bca036d736cdaf194bda89d9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 174/465] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 0eabdbc6403dd411113634905f93dc6e894ecb3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/465] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From cbe4d36f07fc0f58b94a2681ddb2b067efad4130 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/465] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From a837e0f2ddbe1ad6006cd935ae561f6e830eecae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/465] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 7cb5363ae744508b37aa3d533d2a455f0da3ad09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/465] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From ea2754a3dd4ae4616db2138946a2a0690399a1d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/465] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c9b1c1cd69efae144dced68e98110039c856c169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/465] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 161f7ca55f1516524975c57aeaa71b4dc3d4df65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/465] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From d197f5b8b6ed2db2ec7592cb5d0de3f502b46b00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/465] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 6ca6f270950dd3d5ec648d4280531bac28cf1488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/465] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 428a96e9ed03f3ae301b6db330ddfbd45957e148 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/465] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From d22636971e554c4c18330bc8475f135c29d33e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/465] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From b9241ba77ce05a928a77494155cdc91ba70887a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/465] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 5ef3566caf52cd1feb479c541a411508e924c846 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/465] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From df6f059929c22c991ea18d3492d9dac42cb8553a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/465] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 4e9170292e6ba1e112c8a4c9feba7f23984a5032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/465] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 96d0f9e41fa02f5d0c3010f58dba3e26f56f71b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/465] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 219deb0e830fc904724ee36567c6a61c0914a73d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/465] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0e2775905b86175c59dcd4949f284f587b5d2bba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/465] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From f80e3fc4682016f3045ebc62c9b7b1f9994dd15b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/465] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From ca6377c0531c608f8df9aa3ade82cb942737bf5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/465] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From d64ce3f3f2d14f1e5138efe20ef765c0fbca0e2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/465] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 139610b55d8003f7fde183a33740ae0a89229cf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/465] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 4ebf93b8880008adc613d7df7492a9f48877fa5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/465] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 19b8ec274623add5c5e0bb61d334703366f848c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/465] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.42.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 2dc7211b8a328376dd34c43ba770d99bb4033243 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/465] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0a57c153e82d3d1b8e9b23dc94690d50479bafd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/465] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 349c0ebbd8c684138124a485fa77c6e6a3e0825e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/465] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From f0d703a113106543d4ce8f89ecbe97cd61765a3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/465] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From cc0b106d2d8724502084eefec4e34afc5047f61c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/465] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 7d3ff3c3e9cb659e85fa151dd7de38da9e9dd862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/465] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From ffc295f15436b85714ee787d9faa89eedfd86dc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/465] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From fbbc798f392a792193f89b83d4ee150430c0d383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/465] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f9c2309cc5b31fdf246f181a8b2bf85bf3b354cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/465] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 4c54c6083157ac63a95e20cf1ab92ef2afcfcae2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/465] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From d614cd14ce5369e32727fde2b87509ec500fcf74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/465] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From b22666405aad1d4cfff48f0479df004e2f8fb251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/465] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 7d53d3f42aa36760eabbafdb87ffcc296fbde417 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/465] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 636ff107210f8bec979573626dd450e38f4daa8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/465] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From ac375dde67cd89e594ccc5a4eb25358adfc99320 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/465] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 53034636153c950235f515f4ac48718accea0c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/465] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 1e2d0afd108f23b3e605136058cfbd68d889fd94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/465] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 97e1d8408245d620e70ae489655700965e3be69e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/465] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From fa8aaa0799d28cfe99f0dedcbb6344ae42442e10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/465] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From e0930d1f8d64d202165dfc3a25b6e47fdd6c9c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/465] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From df8f6995f9888bdfebd8ed004b595dbad62c7cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/465] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1a817a20e0acbcd2ec8af6991314281abd2def66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/465] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 842752e5455fae22771626fe27787d3982f15804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/465] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 888cf90fa7b81df3f1732dd28fd94714fd487f64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/465] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From f599fae58e024ae644dc26f8956629abe52d46d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/465] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From a3810c9cccbad13555fbb2ab9269e15c8f5d124f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/465] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b3764e7698281081294ffc7b0d3ab21841a40394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/465] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6a51836d4519ddbca168b26e7ad83de7909866ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/465] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d9c17af697e4ad5db741d5f0ee40a3fde1ed734b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/465] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 034f00216c78b8fb80d954f25b366c57d3e2d15f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/465] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From e015130fc59a8609c56a45ecbf9aeac31e60b68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/465] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 70080d7262a2fdd68e126decb74a88851c23b83a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/465] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 6ecb5a2a8323bbe05973d8fa00ffca491ec1b1d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/465] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From eaf3067e16c326d92bba9d1641fcdd4b9ce8e0d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/465] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From df022df8837d265ad1968fe25a2e6d0945db103c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/465] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 40e6b2e653741b53000715077a8a224ebe7c8863 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 234/465] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 9b67c6b9d6228b235bbbe70a31a0c179b77117eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/465] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 7ab168e8a056efdbe2bf2ad05b13494e945fdd97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/465] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From a2d1c6eef2c90f28f6ae29f20c7163d958790be0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/465] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 56e7bb75a117af3659d43ffe97e87778d42c316a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/465] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From b0a20f70c3aa3bb66c33cb280e51807cbbdefa8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/465] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 1797ea9b5bc94383f5162c46004eb571c504397a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/465] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 1bf8448bc63b1c504b96019e853b6093e1c080e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/465] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 00b69bfd2036a5ee7392630325ee884e464d3000 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 242/465] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From ed4317b7258a05b7a2dc234dc8b60a0cd64502d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/465] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From eb60d35818fdd804557ab552e5dc1528aa1e60e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/465] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 0c8638099362cce903c2ace6e7efcc743b26b010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/465] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 65e74644254ed71e04580deb65873a1faf883744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/465] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From c5f5c8523874a16ed19ef7fd720dbc1a14dca31a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/465] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From c3e7db7b9c82b94ec27c3aae44e179263369c4ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/465] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ddbd5dd1ae4d94ef9106a3455e86458894280eac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/465] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From af4f2eda25bfac470727ed9c9833ee567596ba00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/465] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 8ba2baee2b1..c53f68be3de 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From bb1063c2799c041a36e920938403617e037e23b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/465] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 24ed831be035602e18827ccb98a785576a51df76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/465] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 88315242643a1df3df86a1986d69b4e98165d644 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/465] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 797d7d05ea963c3f5d2eca203927dcd7a9e8e367 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 254/465] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From a76fe7c609d8a83b7472a81be94e40d75a895dac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/465] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 42637e01f741fa4834b31c3872db29e2698104c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/465] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From f7e3f81897bd35004e83b1f8d5da3bd3b6d229a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 257/465] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 1af65a1b8ecf115288d9da9672d4843a4340b42a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/465] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 07ed64130aabccdc8e41c2494aa397b356fd98b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/465] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 6d20747b5572eab1fc488b209672d329ea300016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/465] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From cf9a50dc6c3d64bcf7a70e80c1be92c3d2ad28e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/465] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 2c870e5816771568715dac92dac214d88f9c4523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/465] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 65bacece0baece1ac92c67eb983ffa56d1516027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/465] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From b6ed8217b4b505414a2b833d3f45590788bfec3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 264/465] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From f7d819650cfbfc82f26162bf198b86f7a3b8732f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/465] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 62f0c6e39ba2e776335957c37d27ea2b40a39807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/465] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 70afdccb6f903343ba567d16f969e3750cb93e05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/465] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From e99c63396caca1845cc81d03a256e6ce08355c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/465] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 6383a5559e4bd9f6b24fa7fc126d792b70e93072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/465] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 6e26dafbeb7e93b4084ad282d378c4f885f2cb22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/465] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 296f1f66d9bfe4abeee661a38b3724355c9ee0e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/465] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 8b02dabfff5cf53cc6fd74df131bcb443c00761a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/465] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From dedaa5ee2bb4f11e3c8f593224b931efd8d62ebe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/465] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 213ffe4cff9bf0c3aa83c0fc5f82c88d3ace8545 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/465] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 5bc5ac4a3a945a122b8264ab9c20aff4bfb448fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/465] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 504a0adb0a978226f70f2576a4a490b830e2e4a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/465] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 155f4ea4311eeb314d84643c8e41c7c1581a1b2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/465] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From f4f4fb9e69aba7c2a3bf926ec6d5c4b7d640bc79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/465] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From a2aa02b8155c2a9f6bed019620ae2bc6706015d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/465] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From a700909bcfa612944b6168d2daa7ad006ed001ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/465] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 7a7164c5c6ace7c3a2ea2fa26b7a0d223df870bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/465] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b66365c34478c128b03139ddf40a125c6a3a78ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/465] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From bf2fa666efd24901a723987b0d10be767d3f7041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/465] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From ea5342be0f1b835f6dd39f424d96262641c61c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/465] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From dad0c511519d688de98e6d742e90237daeb1629d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/465] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 506cb44a87d9d22d878f76ab5bb2975c2ea760b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/465] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 3a76fb4a27edc98475fc03c8f42268e2e11f0114 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/465] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From efa38739b61c84664ef2494709519c10cf9e9420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/465] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 291e6b6847c664621740e81661c1ff9f3b9c4089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/465] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 1d7adf27f7a8892cfbbbb95286c16d77d8d3d3cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 290/465] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 0b4370ce44138a3289c21640dae373cfa5c5c60c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/465] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 4ff44ec11d02c32dcae6fd585f7e513e469a3a1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/465] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 162aae8fdc3a092aa3fc70616ba00fe4239c31e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 293/465] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0dc33b7d7971f9294fdb7730f1eb83604ed4a858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/465] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6ea53b88c084811ed5432bfb3f9bb1df92aadaf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/465] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 1b204dd30a1a70ea3d0ec18a42236484f506b8e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/465] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 4dd8c0b78dde14e18ad6a4b73da4b19aa124ff4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/465] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 90a2e96bf2ca00a4f14c430655c7f70c66102a09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/465] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From feefd1eb49691a3c53b3c63d0fd07d4661cdbc2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/465] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 18db12fce9240d77b0c65a5b60b8475258c870fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/465] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 1c5e150f44e4bc2e02714f41b3b3d93c132bbe63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/465] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 96b69d1e3e366946b522dec6af755d8d4dc66438 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/465] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1c3b7310323efa7e4e96b99fdead0fa43ed3ebe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/465] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 9538f36625a3b45ee2661f447542ac3160ae1675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/465] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c82a3779287a086ffd7eb2f2a757105f5fe2040a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/465] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 359efbd949989b64c81fd802bef960bdc7acbd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/465] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 906e997847b2b0b6cdff93ff35e9f0cd44938afc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/465] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 77e171d9460fe7b669d0790489f0d2ec2b5c7d26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/465] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8300a0c9811bedfd29018ec0b1705a7ec28f4aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/465] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2dad2cbec1becf62242c1c6c922d61e9fcc66147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/465] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9d2703b4cc51e3159073857ded19c0ef88dfcd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/465] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From d38a15646f3d2fe37164bb5d54dcd651a70f37ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/465] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 83ce37e45df52c09204ae2a28cf284ffea4a1603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/465] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 80365d2233367a9c60af6d342653b2091517d648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/465] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 3b8af5249a46cd2f19da95199b388cfd8ca5f0f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/465] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 2c0d01af595dcb0fa692967db8d2b25bff8a7ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/465] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 574d3a480aa4f97961a8ef312635113b0dc9932c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/465] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 8b4497603ed2a371f703767d025a72d7b2685826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/465] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 2a6a11984322b54c3780aed732d19a2b158acde8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/465] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 61d5b3bff87a9c6f5b80a82b22262786b3ff1408 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/465] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From b6a407f59ed26dfa71ae38cb171710e4eed0d93b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/465] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From f2f99a84754ad61b82e269b78d92b12bea81ed9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/465] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 5a2145c6ed0338a79eb73e3e2237536aeaaf2ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/465] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 685cc7900b25ccebe2b86bee338a5d10abd353fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/465] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From d659ef537dff84086397be4f6646f04c256a00fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/465] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 61421e257952a204b4559dc453f3a212bf7b4b96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/465] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From f5445943688d6176dfe93e92bcee86d739f89535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 327/465] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From ecc2df12f385703270a5609149ad59a7371ae03f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/465] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 1e118d380b055351babd2d8a725c06c9d41977da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/465] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 617d96265561eb62ed6adff02cff88335d7d4e97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/465] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From f4ec9caed89d274452673ddffb55a83dbe921997 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/465] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From d6453f736b6808b1c044b1ee2895511cba547c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/465] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From aff1976447c0e5d43b22c26c6d7d3b2508b1e131 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/465] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 930397ef47b3036a4baa17ceaa831bd29d8154cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/465] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From bc1b77948f02f8977f45985e816c42e81ecb9c2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/465] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 722947a091f2d33a931389c74dddab069b75cfde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/465] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 3d6e4e067140d800c580a3792540ff292c819163 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/465] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 137f3882f4c6273f94107cde1db461e808069ec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/465] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 536703ac49400161cf76b2c8ec617d517f4c5bab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/465] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0c39b203ca9cf4fad622a815aa94e6e94c2f143f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/465] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 1bbf1ba4f8d291a4d8f5abdd6b1bc4730a158631 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/465] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 565536938789cafd1dd953f18b0496b5a8620979 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/465] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From a04d9aa688898505991b4a5af77fb60f9b88ecb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/465] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 20fe2b51cf6fe927dbdb5a005fb27b0e8cf787ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/465] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 9147e36a2af590ef8c44787871acae090ef04e8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/465] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From eefe64e70a829f80b60d6585f51665d6e45d328a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/465] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From b10c35e1987a288f9ec698c3a2198a2782c3b303 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/465] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a848bac2f264cc697c5c41a964c10f2e9888e347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/465] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 6cf8300c91a8ce872cb8b2ff7c7bca4981316017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/465] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From bfb7b963cf85609a6b9e72d1f6bff85291b4dfad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 350/465] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f4eca2061e49c75f148ec99e760d45c01db75d05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 351/465] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9ecca173d588752cdc620e7e6aaf4b84deda6899 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 352/465] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ea4cce53ddea0879af789d8e4faeea3545dfa832 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 353/465] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From d49b41566a00a6ebcf90cf50a6c65a04cb2960f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 354/465] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 4e02329a7ae39da9241d50aa21056e287d88d027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 355/465] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 2c8ebee23789e34511311ceb39165ca140a4363a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 356/465] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 39884c8d098e3b3ad463de31d018eafb585e0640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/465] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From a1849c8727b7c16eee6972044dba9e435071396c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 358/465] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 915d317432e2d2a797840a853694a5df4f1cdd4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 359/465] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 036f52a89d76dfe40ba1c24d8dfefb5e025d25e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 360/465] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 64416bb103460427c5ca839d2778e87ff15daaf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 361/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From a28a28791469935edf993bab35fd85a36146307d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 362/465] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 4fa3b88eefeef63dcc49f6e05eaf3257e80ce579 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/465] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From f8d1b9d94cf46bac076b4674a47007e88223d9ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 364/465] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From f9646f4dcb93c8570e0c156a0aeabdc0e6d94aee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/465] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From d0e348443d3a1a95784c522495088d0a108ab07d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 366/465] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1bd3bc91889a8266530735075c5306415d15ad95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 367/465] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 1f8b78459c53d9642f8acce604108bd0b324ebc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 368/465] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From bd5169c7678d8c463791bcdc488ca13a330a3060 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 369/465] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 4e6d111ed0eb3bcbe1b0fe92f924b7c28ee0e89f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 370/465] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From c485361df671ebf1d7d914795f3566773c313cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/465] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 93d524f32f62db7c350ef637ce88ae9fa90e840f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 372/465] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 317ef6aa33aada1cc860156041c54cfedafb1335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 373/465] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From eee347d205aa2cb7a2b8cdd678797dfe8e980915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 374/465] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 7722c5ddf3b5c13f0a373e50355e6fe762292dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 375/465] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 9fad7a5678217bb0037331a4f9ff91a116d1439f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 376/465] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 343945ccf0d7530a82e98ecafa543fbdb610c473 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/465] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 2989b187fe966d6d48b63944295cbb9653c4f0dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 378/465] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From aa097fe96fb0a1459360e9f0e811e6fbb676ed20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/465] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 4989ca78006f0376bf44682b769d54e6d74e3336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/465] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9a22c84a898d615978c543f58839a2a0ce0a1bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/465] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 8f47c9f7473493270df62104e552b24a3e6b5968 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/465] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From f7f936ad27afbcfebe04f332e688123d20b1cea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/465] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 0fcac7b15e4c4738df10357bcca83e8c06527a31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/465] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From f8e1957c2ab4b05314361266da24e9cd802cde60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/465] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 5b3d9d0bef0be5fdddb60679619ddeebf09a15fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/465] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From abaf5c5a2c866963b2c1ae966826dd4f907006a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/465] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 995bb871bf09644ad49555da19ec18271b4c348e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/465] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 643d5baa96ed513b6ed171b114f5184436300372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/465] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From ca559e426218edf030429574e7fa5b285449cc1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/465] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 809d44dfe92acbad64ee0dc4c29e943f3d38c568 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/465] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From bb2d013c99af59a92183cb26faff22fcde11b9df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/465] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 06fec8be15a057c1bbee679206cf47f6ec3bbedd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/465] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From c984e182ca25f76cc39445966062a9fdd4cfadaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/465] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From b7bdb3438f873196a36d4bad3cf35673589542e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/465] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 898cdd6141c5c2c1624bdb3c24c3dddaae8f6272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/465] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"

From 614c6d286089549f994f8468254ea9b28b885ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/465] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 75b366be82ecf00faf1567e8a08833bb59b8a13c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/465] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 214beb22129585b3cc08457f7407cecb19837c2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/465] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 410e1626179b035cede614d5414dfa0daa857b71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/465] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 739168bcec498429e97ec0fd14601889e4bbee3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/465] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 19d9b58ae40d8cc08497a6c94fe7b676f20817e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/465] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 315d267618a7dca5c92a26825f5883ac140fe924 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/465] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index a7b4fa914b5..9661b0f4f6a 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 0637b81aa93497677812d8d1636c3d37a73350f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 404/465] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From f3a9608968959a1ecd99b5c0575c0b00a4e00e28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 405/465] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From ee135696fb909f160afe7361bd75e407e03bf598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 406/465] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 6c09501f6ef4327aa2eed4d582421742d4e2a037 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 407/465] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From bb605f79c78ed1bbff5221dec5e6da9ab236f3a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 408/465] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 53d54f3a48ab83daeb75adab7071f4ca70242e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/465] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 85545c39f9227103e8b0844efd567e3e432f7cb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/465] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 00b68206267458dc116b46384c9e51f7d079c8dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/465] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 7f60f26464af491f8f80a391407144e5fe3373fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/465] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2d3066a5b38f25b5404996b2f300b5a43b4e50ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/465] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 22a19f9793cacbaa6118dd38e6c04dbd54e05056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/465] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 20810c26371db556cac89bd3cb7ed79f097437d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/465] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 4ca72f348b31fbadede4d8815ddf6f53cbb27db4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/465] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From a0d6aa73a03a5aaf4cd4fcf7da8a4683b5db62eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/465] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b4ab49d7727297c87f287bdc654add707f98b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/465] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From dd6aab3a8f4b4391ec153e5ec8ec789bfc274a70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/465] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 594be3e16b9aefdce7c23bb819f0c24ace2d6cec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From e968cae2d1df37390dc4ab406dbfefc35536bb45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/465] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From aa53798b00f066507fbdb36ec40b6d6dd3ebb086 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/465] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 44f25a65c22fff1a060d7b246b22a90e5674b03b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/465] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 43cbfdb06842c97903807067b0e7599a8e9a5cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/465] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From d243d7baf0c47f12d3c7eedd9121c5dff3e758ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/465] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 021130dda80ad4a5fd514f71f11ee43d319e5f3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/465] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From aefba5bb1e9ba5972b265ba38b103ea75049cf41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/465] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 155faa7be5030f99d2b434c6061a387731d027a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/465] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 8fda4c91f2be94995077d92ffb695de83ebdc58f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/465] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 8075098867de4cdfad53b3536059fa42e013d535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/465] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From c5c68afdfd9560c10c271c732d5eb18bab3a60ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/465] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From b44f617602f529f207292c9dc4d9a5d9c1ad13ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/465] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From e54c522a41ea2116980c9383cc7f79e8a15229f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/465] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 49cbc9dae487697c3f361f19e81cfc3d8deae7d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/465] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 829803d3179c6ed572149be4e4730b73c8e5f9ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/465] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 86a882a73f1c541337dc4042bfb433dd916bc536 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/465] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From f65f37756d767a73b1f2a5ac0cfed7dd9e0af0f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/465] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 1968eac9413a6aac9ca0e9a05877b3b8c878a26d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/465] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 8729a51b33c0cfce460b2f4e4ab3bcee51998724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/465] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From ad7fca859225a83fe5fbf28f1d6caa1d02ad71c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/465] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From d1e9bba82fdfbabc66116030b768a708a0970450 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/465] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From d2f13d20aef89a8edd6c833954afefa33a4b3ae3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/465] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 52823c282cb324c078e4146c2b6daef55a941b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/465] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 68584f87c7b9696a34e8f17e0b5eaf0278fa630c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/465] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 9e27a63bede50da8235f2f541b3a47c31075ddfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/465] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From f134e18ebd6e28c45249e6d3020ff6e36184057e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 446/465] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8..d1efe1931d5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 085af3101a5a19b776dc17f77cc41a6ceaa06d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/465] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From ed84a2624a3f4498578166d8d7c4b36ba3769141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 448/465] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From df6326c090bbcf17ae7e3ba392e23fd2d72e771e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 449/465] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1379437ff4c15bf7533a685d042dbddf83111404 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 450/465] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 2d0996512dca7217e9b462512d9b236f0e3672c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 451/465] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From feadf25ad9573abb615011bbc3657e398682ce34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 452/465] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 22f4bf0589d3bafd38a7ac0065007113b1e8c6b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 453/465] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From c8d3117a18d8d5f811c455be489bde07b03e9f86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 454/465] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From de1c66b31d2f2155d97dee9bb41993426f99c151 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 455/465] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From e8d6247f0a6512ff701ca724a1bcd7f7b53e4b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 456/465] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..235917ab151 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 3ca67b828037712c41d7be7b20b211c932c2075d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 457/465] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From a679198fcce2a87d3e984424507f38c4b5c2328c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 458/465] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 56471e23e6d877f0d605c0d6286e748085da612e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 459/465] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 36c22b1a320b78257e8418eef11f2858c9972bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 460/465] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From fb5117f91d2ed4cad0b2c5827ddfd791e55c0ce7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 461/465] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From b56a6d0c38b6d5939cad1fcf30295c97864de426 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 462/465] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5bd8f83eb44f014d0e8947da3a1676780d58989f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 463/465] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84498596e21..3196300abde 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.18
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b9e403a863bae23df25b83b03edd85d8955940ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 464/465] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e2347dbf455b79cc63735809f3e984e2db7af440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 465/465] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 586747 bytes --]

From 1d7ae6c84c26d6849ca8ca9bfb7d115c4c9aa4e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/465] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index b016d28f788..5ca3dd920fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 7d37b90e4838ea62bf6ac319f577cf8d56bd541e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/465] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 1efa9a6b585caa71b4105ccb7bba150f8bc7eb56 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/465] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 2f341683bd53a4f21e879606640b168218b51bfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/465] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 7729b6498204dcfdb82f5209d2e2aa23ccc0007b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/465] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c022bb4797e378688cd4757d87b280945419f9f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 006/465] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 2c42348af2fbbfeb602c608c6c064ddca705a9b4 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 007/465] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 5ca3dd920fe..51bc251120c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 982000fbc7a648ab52c482cbabcb97ee25b9b6d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 008/465] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 51bc251120c..af472649703 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 071a5d09b917f1cd32c762399bc035b45bd128cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 009/465] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 3b4c77cfef264799ce47c52a4d8e30cf9a3861af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/465] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From b4d8a4d91caa02bb86948a755ae574a5f5594951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/465] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From d9bfd8b16b27cdb82ee785ddd6890917702a8dd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/465] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From aa6a0512b729634b10a7d2cd8a47859db8e833b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/465] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 50429937d5eb48b319a1e0f9cc8fd15a2d42eba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/465] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 8e2fff1a4b1579d877f8ea028927ef92e164ad46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/465] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 62395e6c957ff7bda2397d3c2bfeb75732f8bb86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/465] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 46e3e02e0551feca8f42035c1d54567aeb1b3dfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/465] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 9b7a900bbc4913f416d9f2525742cd74c4d42ddb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/465] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 0c61df9582b0e255e33455c8f04382f455a8cac5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/465] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 174237b3c2c3bd3c3bf479a68c7af3741b061adf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/465] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From b4f1e1b4dfff8f0adf10a7ad3ca200f689b91312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/465] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 25e8c66a6be094ae485eb73c9e0bf5a5c06591d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/465] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b9a9c14667e789a38f34356cc67817180bd42784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/465] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 7061edb62b173201cef4af3bbfc31842e74cb518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/465] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9ac6bed8f68acc9bd80fb54ec91ba4a2a5d780c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/465] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 0d08935e355946b58590aaf8c9bbe2aa76cbe5b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/465] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 50f5aac29e9a098e2d85bf963a735b08a7b773b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/465] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 170e9ba304fa4267114a87ffbed42567cf19f63f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/465] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From ae41683dc94eef91ca261276ef41d7e4d87ab118 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/465] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From e829208f9dbfeccc3336818a09f5b6dac12a2fb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/465] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 26ed7673b939986f8842ef7e13c46283a92e7539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/465] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 04ba96decdeefa5cef49e34362ba449995a3ea2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/465] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 4a816cde09f03405d2a94576a71b3dda082e1548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/465] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 9224abf3282467409946955a15dda0ef76e8d469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/465] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 31536d53b94d2be4831fb51869565dad84c2a591 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/465] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 958ab87a76755dc38f1ac2a3a9484cd475d700bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/465] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 1611cd453843458e0fa1f28424d4b666e2bd3065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/465] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From c2d5e17404f88b95e55c83577bd8fb7204fb625f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/465] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 2272fc255274dce13f84065af468f15593e0e7db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/465] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4cf0225445b4cf0f64b817b6f3ef974f1b119659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/465] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 0bce284ec94fabc240cc5ffc1bc596361923c484 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/465] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1a30e6cb3c68ff4d0120f538530c2784173d8aaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/465] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b0f124de42dcd7bd32ec353d8ecd1400d1092d49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/465] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 78ba114e7ca01d6587356d04849c5b98073133a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/465] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From fb31bd0274b4282ab63abac53b165f2e7823c880 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/465] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 3f54de5a11a57941d4e3368202dd6738bea10689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/465] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 2a437a7e4bfd352218c1afa6dc4ee2044fa174c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/465] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From fe2db8d9a75e6ace6fcbbe0922d5a2a296ece962 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/465] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 4c9eb123070ad6a292ebe7f0370631175edf3062 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/465] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From ae5f63ae88cb39ae31a535d99e4a247e55f8d815 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/465] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 9ca8b5053255360bf47d55c89f41264e9456f37e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/465] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 09de715de693cb6a6a58dc4090108abb4e057819 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/465] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 43e1d68f21486ca729d51b0315ae68663c482770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/465] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 47aea0067537568fe1b6e02b5fadde8a8c5fd014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/465] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 762d1dbed22b99ff42f59f39cdd2c6891ffb3aee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/465] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From d228d79e0c602475d7a1900b549b716fb94c22c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/465] dillo: rebuild against OpenSSL

---
 .../.fix-FTBFS-with-gcc-10.patch.kate-swp     | Bin 0 -> 106 bytes
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch |  80 ++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   |  66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  |  16 ++++
 srcpkgs/dillo/template                        |   6 +-
 5 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/.fix-FTBFS-with-gcc-10.patch.kate-swp
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/.fix-FTBFS-with-gcc-10.patch.kate-swp b/srcpkgs/dillo/patches/.fix-FTBFS-with-gcc-10.patch.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..4f579eba932f623031883ec2465060433f9de507
GIT binary patch
literal 106
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnX?NtZ*sx)bhr<lb6|2~$-%?dwUlkk#
Xlwkv6RuJt9=dyr=AY67J6Dt=0`wJ3E

literal 0
HcmV?d00001

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From d5220742a41e983e4ee343ef5f30bc4d628038e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/465] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f8fed6d573fe4c1febc796af5d5ae01fd98c26b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/465] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From a3ae826eb10b1a255ad87720e66f82d4e7f0c631 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/465] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 5448538a284f32ca8903652a712de6fd2e10b4e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/465] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From ac99ce78a9c2615e235a5499c4a96a1d67f65557 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/465] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 958f732c05ba1b27953c1c0b1e11145934a0f2d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/465] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 2e03880d9098893441a8ba5f9d906d993e18e283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/465] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From fc926484de4a12250a8faaf08632521bc1e241d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/465] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From aa9d6305646f29af0338835e4fa03d0a3844c844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/465] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From b775d1902226c3de3dc8ea42424362829a092d2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/465] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 07f8dd58e5eb56fc335233142b8f209614dba471 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/465] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 54b0cf4931c1726a7d76fc82e3c1cecf6c5c7e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/465] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d5a9e4a85271b58c1c40fef4d0d14962ad4a4349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/465] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From bd062a593585e4b3831e6b402f5475704665dcf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/465] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b3093004b9d4019d522260694186caf9e985f25d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/465] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From d107433855ae84e3930031fd7a239e715348cb47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/465] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 7a051e70689f8ad714f3c83a4c54e535d81604be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/465] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 0175af13c0af9e06e5b54a3c8f792919ee5d2233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/465] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From ff121ed5abee7bed53ca3c21562e385a27842381 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/465] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 15d2dc3d5ae1f03bbf23934edb43b49dea50d51a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/465] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 0e1578faa8d8d5a14cbc23265b459c3e7c69aeb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/465] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a1720119899917d20035a1b0559459f0acc29ca7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/465] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From dc9e9a85121d4cce8c8186e0b4b51f5028a13d09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/465] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 7e3f13227a5a6c5f806cafe766cb713b6905c4d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/465] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 49369b7d8631c031c8b2c34edd8743a3b783c08c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/465] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 8263a136e08b168d6e1be496a0de91b7af497aaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/465] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 39ec0c572f63488793e6a2801c3fc6f78e7309f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/465] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 3be42db2576f8b93bb4eaa4c3863430dc6440782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/465] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b9034d36359fb5ba13070a963e6b66d383380d94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/465] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 4ea23b4c8f31f0e3813d0dcd802a577d1fdc0d0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/465] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 80787e29b25a93e9864d5b21d6e2966c4dfc4c42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/465] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From a2b8ead2d64d161bb7b8db6eb252d0af5e4bc257 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/465] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 55a2ad58cfa807a817d6c9902902001f24213170 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/465] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From ee8bd74413ec6184c08884408b53cd509a21d66d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/465] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 59b3d49e095b1f5c8e39c670286015139277d9da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/465] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 5348b770e9eb0c12c837c570f2d1882cc6e9f498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/465] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From c79429dcf6a6cfa215d03d9df8407c04b22c8dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/465] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From c349b9de480ae75495537e488fe99c7166e44104 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/465] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From d56d1de1a46863a589ae326b5b19d6ded8081c78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/465] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 4e1cfab4bfeefaa2ab7b6782bbbfffe9a720cfd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/465] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 758d99ced76f9b3315201ccd2666d90c21366627 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/465] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From b078df6a5c380eba0419a6257667369e35ccaafa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/465] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 8f2dcaab0ec0635818f42240ff3d1c0a0fc73d14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/465] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From aa34c4cb26b89d33b6d837d2f002a4e0ee2566bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/465] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8d36aa4307863c049b70805bca76e53fb476cd8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/465] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 28bd8c7e7fcd008a34ec189ee9b5799df1fcd932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/465] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 297d246fe2048a9d0112bc45ea22baed4e406f55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/465] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 8e280efe33c94b809c230ba115dac3dc5e3cd524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/465] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 2483507ced422e90a62e257fe62e824dca0ea9af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/465] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From c3751d827c992eaf6f4f5bf138ea23f709cda09f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/465] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From aea2e088deda90974a25270edb474f9304887e07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/465] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 31ff5d0f36e1356305b686de7bf3e23337515eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/465] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 8b2c9ee4125b57a22015e227e272c7d171f1dc71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/465] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From dd7ab8be0f03d8473a27346ca1fd503e75a52821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/465] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a9f470fe68f921ab5f58a83e96e298057d7f6952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/465] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 56743ca4cce4af5a35cf053177ed98d91f988de4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/465] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 1cdfaa93c3965ad529812d4f8ee4e1b84c7c5cf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/465] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9e71e1dcdad6bda7ab57600a6df37d0501406170 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/465] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 67a1a8bca2e1d03536e38335931ed6e40d420f3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/465] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 850cedfc6a90a4b19e63d92f8945f074ec5a9f6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/465] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 05158c8b3d175b93e04c07d00d3dbdd6f192630c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/465] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6d843a50491a15f7927b0208a76180fbdc0e326a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/465] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 0f2103eb2b906c8b71660cd5e82994cc64a9b16d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/465] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 55f497cc61ec32d19a382619579971798973380c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/465] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From a1140b6d8377d1beb62d02ffcd550c2e3d0099fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/465] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From be0b7ae4488cd9a7e5f922a2f88b0e49c7c8a4f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/465] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ca8ae3bb59e4020622f3dabf569280cae4262b6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/465] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From a32d6fdd6cd2c80374ac191d67fe3ed667ea43bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/465] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 1980a526a2df1b4f503da8a162a2dba276028f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/465] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From fa8f6f233c2c8f44036824e842cd1186204915ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/465] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 06e41ec04e6efed0ee8e09a1ae95cea96e760808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/465] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 0bc69b4027c54b10372e479018aa68bdf498f087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/465] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fb96c525507120ba902cdc4e30ef602a2f3d2192 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/465] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 0b99ef9220fd4b8cd45e337517f587e5743c463f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/465] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7995a4837e0fc351445e645d0a4e61351cecb53d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/465] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 6289e7ee6b9ee54b4a8fe321a4ae3b7abb56177f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/465] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9066140706309c427d664a6a3a28efad21b46117 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/465] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 4772df36aad61b9965b8cefefa7be874b743dbfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/465] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b71bf459f65035b15cf2012868d65f512dc34441 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/465] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 75d2ca70a967963f451843c5dde3114fdd0e65e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/465] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From e8645acfcda43fde11434681a011c881d193961c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/465] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From e275fe3ec223d80f9b421c78c5ed3231711caa7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/465] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 96c1b8b74e0a2a82fa8563569af26eb20327a723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/465] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 26be8af92e98b7de02d98dea48737a7e15f7e027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/465] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From bda53422d0593675fc3d6f9566c49e787aee3b42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/465] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From cce1729abebca9762d365cacd4135a7f21d72b97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/465] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From b3c7a27475ca4af4bbc03605cb816feb04b2fb1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/465] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 82912e63eabab091caeca926bcf5c30c23f978dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/465] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From f6f024aa4b1b932e167b3cf1c170fe0f9902732b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/465] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 9b5051e0a60bf7b9cad4a3112fb513a28d8ec762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/465] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c8ac72bd367411f37dd2397bdaf57e1435ba0f09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/465] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 5a744804271c5575b828d226926cba6b283e5173 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/465] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From defaf770e7b8a32d1b222d7afa9878916f821f3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/465] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 02273bc95c6c692e72ebc530a155db4392637fcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/465] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 25588d33e055095faadf522d1367470946079116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/465] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From bc817a8e9457f5397134dcd8d92ccd4cf6916252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/465] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 164ded2743c5d053848da81d6769dbd531fc9cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/465] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 5a36deb2a32f2a3d682e7752f266a0bfa1f4adec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/465] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 68cf8f3630cfcbcbca7d4a593ef2889315cbe80b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/465] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 648442a98da478340b9a921fe4da7e0dc7237344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/465] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b16748055ebb803d983a6785644054e457a201d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/465] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.57
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true

From 09b6fb33bfa5abb1474b13af7cffd2efd410d4b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/465] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From a428cb117253d86aef33566bc729d0682b15efa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/465] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 14eb0bc7551e788dda2425e399b2c48cc4a8511b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/465] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6dc0e363085c7c3e0debf32c214e2d53d862e081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 161/465] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From cd78a26c6c0685d079fa741a87adce0afa47dc5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 162/465] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a44617aa4575ae805d0b9c2f7ffba80538d73595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/465] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From d59ae72102222d0bca4047d7935ec53b7ab0240f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/465] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From deed51c487d16b01ba19f3cedaff2e6726921769 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/465] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 8471a724f9b73d02528bd53d5f60f7084d19fc00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/465] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From f5bff42fff42d68dcd1a94e7f28c2e03c74c9eb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/465] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 0b062e4946b5af35744cca2e48572e3b9270c344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/465] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 72044936c1c6a43ac660d3d6fdf9e27721e0e5c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/465] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From aed04cc09e2c8d3ed42bb36068f812d5bbaf3adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/465] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 74c9611ab66b5be621b181fc81762e3571dee5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/465] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From f31712e8e5140b32de7d6c17d7125797a9f91c96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/465] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From a3059efc83d5acb0d184da52bc25a0346ea460f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/465] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 08fb956d28ac1bd722818a7f11117dc434c23dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 174/465] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 4871fce774cb756afadccd297913a49eaaa57201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/465] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 39496fd4b42132f9a49aff7fd50dd36384ef35b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/465] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 1f276489c2fecdceedf7277ae51fc6af582d4481 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/465] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 590ef7195d63813f73ef442702b74d1629368fb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/465] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From e1984483756b4cc1f5205015b053d33a54e34bb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/465] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c3c4872450e3ae89b8b62f1b03004203fe776c7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/465] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0330e87d3981c79bed447960a036f0758db0130c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/465] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 9805f4548ade706d936c258ddf9231925c72ff2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/465] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 556c74bba57137c04ccb4864f667e3f7cb89484c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/465] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 1d1fe00b663700bff2b44cf32b364fcf764f36d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/465] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From a53f10281dd9ada990a6e199b03a3a019c37b7cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/465] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From c334412787c1a337b2558c1f40e6fbd99a0f874e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/465] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 6106670b2e269917a3fa9ce326a70fdca99c78e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/465] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 4e72ce550324b318797f36165f87cb1bdd794968 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/465] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 6aa1fd41ec947b5aa7584797d1484cd2b0fba3df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/465] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 8b21a87235971b88d554b280364254b35abc8275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/465] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 1c85d0ca2f81416a7b335d65acdc43b42feeb434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/465] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8707563612cafec1b9fea1eccd301a21a0e37d9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/465] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 4b68af5362e9964e00ef66c7187b893ea977322a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/465] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From c08d53e7ca7f5c311c8400be5029ddd9465da9f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/465] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 90a285fb35a6ded1bf695002e1350547af841419 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/465] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From b052ce47dc21efb0a0d09f130e5d94fef8245836 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/465] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 384d86b9a2aefedd185e946ad1e11fd55fda5985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/465] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 4dbc8c72dce0f4de565ea5dc5f28e8dc035a6bf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/465] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From b607c1162eb36e89ce1e8a87ab8299d6c2ea16b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/465] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 43440862a9d2b003bd104302754f7a25ab5d1518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/465] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fb1b05a631d5253c2fe5a3c3ba382f8f9ff57f66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/465] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From b04ffcd1066356f20688abb1be8e70e78d6ac3f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/465] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 108d101a546b6013af3f6b0593fd67bbe73febff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/465] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 3ff8304f6945e647c4bbeb9bef0df90e01cac1f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/465] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From bad97f3f237642db5309a4c78d5dd72b4e92dd4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/465] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 1811ae76f55d361a5a4fac35fd3cbfdc6fc513e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/465] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 6dd7c8f843a6fd6bdfac6dbd7102f5d564dfa171 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/465] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 608714407c0e549cb706f2f69abcaab4e30ef6fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/465] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 1b053dfcc0dffcad39c85897ec7db5b97880c0da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/465] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 3b0b5a0ddabd7196171a1c6fdc109c5651191301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/465] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 726a8760a63a83f4ee5e00f74164ce0af829161b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/465] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From ba6b0d1205903bc3f9950696a0886e7e64447bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/465] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 6c8cccddc7aa04a4929900c04dc755915074feeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/465] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 93126d6027594853514675d4c2f2f7f3f09f327b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/465] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From e276425a77514c4033b99c5e719b916c55bd4272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/465] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 1d1f761a0b3a092b3a915c03377c6f5da38c5717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/465] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From a0eb5ce846f9404c79de5557aafb06f1fd45984c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/465] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From d7953cda6d4fd4d9de6ff3964d392d71e09c4d1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/465] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 0e444b8171a5296b906ed264beecc6890279af07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/465] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f1d4da1f2c0e47863b0ef6808c308d83ffa72efe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/465] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 39878f605a525dd3e30c10b0c1eb481cd2586d42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/465] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 29360edae17bb1f63918dd2e2b275cd014a9b8e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/465] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From c77ae6d3827d91ad2f4a3c69d9bed460dc078617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/465] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 4af9d71f57a4ffd0d32e74673f1d9798b0bd6144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/465] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 42ff2e4d2488c492d581abfe38898204dc7fee05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/465] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e10a9a9ae5f90419fd3f3d3f667865b1863dd069 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/465] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1ed7f182e0f4c3cb5614187913f0ec68c2526c77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/465] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From c435cdf34b0ec93e562d84d500dfff9ef97dd885 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/465] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From cfa449ac863c8f98904569a9e6cc737022097a71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/465] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From e15b25e46711cbc96d21f87cb7b5fb312cb5745a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/465] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 9f1a14a40b63bae2ef00e644385855115c1b2055 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/465] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From e4450ec2f45c52682bb964d03dc9469ff97392d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/465] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 2a941d9e8e83cd5d5fea2764ffd470c27dc6fc15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/465] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 576b768aef29d3ba7afa1eb19cceb48f21e95ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 234/465] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 9ae1b3d78a9c71c490aa85ed31e0991027c730f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/465] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From ef7d7d893d67ae5d7d82a29ef565f716de2cb093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/465] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From df3db68422398378ffe86769d017bb654e9608ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/465] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 10f72c52af83d6a4a802c21eb8d4da1bd6a72f07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/465] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 91c76140bb4f9a9bfb4e26c6a527d58e40378154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/465] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From e47c61d69982d377040b21da43d97317530fc57c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/465] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 076983453e3111e35b8dd367992619942feeff85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/465] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 56dd9a9ce6d8c95718ee04b16ce4d6043600fa8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 242/465] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 49deb05f1016656e0b9245733cf7a8fb58a6e0bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/465] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c75077156b1f1038652be7c4cb8f237c3f7c4378 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/465] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 544217cee208d27a4d2acf34dccce37534bf69e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/465] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 5717eb0768f78f9dbee18179452f0baf6a938266 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/465] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From ff5337b31bb7f1f5569a48f921dab254a74e628e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/465] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From b096ee35d9ffb7006fab9ef654717ec6c15900ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/465] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cb9d362a61bf073e1f36b69fd824e5b1c3fe73b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/465] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From eee5c296ccf95076a0860203ac3c925ab15605bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/465] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 80b7b05bcccd8a246759303196ceed0b68fbfd18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/465] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From d202eb093e45a56f0158659a9081b6c5dc4c3d53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/465] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 8aa61532996f2de941bdde2f6d2e2344709c1e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/465] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From a7ea061219635c82a1a71465a3ec16a3b75943b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 254/465] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 3b721c0d31e4e0edd8c5d71dc7bfc7db82827f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/465] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 000b30a6430bb5111640faac0b9f279dfa5a4d6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/465] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 9887a69ba1e51257720079e543ce508352332ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 257/465] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From f418e033ba822059cc36e76f5a999d438f5d8d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/465] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From aaf7e5574689b3ce18836793f38343e7b5e8427b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/465] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 8f1c3379f5cfd23b824d9a04a62b5763ef95f862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/465] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From ebac6832ae4ae06f61cba34b761420ca27604d09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/465] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 0285b5441ec519dcfac0082c683dc429308939e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/465] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From c73f3399e243204223329aece0ca67c595a29923 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/465] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 3fbc448ff6c9b5d4c8a903e4cc038d875a08c49a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 264/465] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 46d7f620845c0e2eb5c8b2ab5c785146e0c72f52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/465] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 1f8bb26bf259a5b7ab26d2ace25526d4a9c1276c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/465] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From ef3e3d7e31df64a78a0f31b1e950645516eaec93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/465] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From e0da2bcce4e77d1235b5afd7292b3046243992bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/465] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 5042299385e470151bb9dacdd2fa439c3f475d73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/465] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From e7f1d411181ec01ca5dbab65f45c560217d8cf47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/465] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 336d0345eee60eebdc8b24391a6589587f868777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/465] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 0799225f0fd55c29b68f8b42e435d3992957d19a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/465] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 65c9e8afd4deba74331bfc37f19eb80054905fe3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/465] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From b194fa4005e5288041681e6aa78c9319f364d70e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/465] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From dde15f38dff048113a573bfe6e213309a1485141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/465] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 0394e8b154e0f207f2ab2eef3cc4201b11003843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/465] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 6238c4f7e4a58e9151b91923697eb5b044d6f191 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/465] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 29d948dcffc5bd31f6c238434e3c350e55ae148a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/465] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 229d5df1043b2f4540af8cbefd27a5aa1c1f1a1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/465] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 573cd1399e9c5ea3e137494d0558074a30c2128e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/465] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 23a48a71c716bd73cee4e43a7842e2a9d6cca947 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/465] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From a6a60ec19e4a17f765f958bd2b717f58aa86e59d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/465] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From ccd68dcfe65af084a77cb22fce70bc30abcb9a42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/465] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From db665cde15c0ac8a45f84e9a402db1008f55c56a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/465] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From d241b2e2f93a75860e588ecb22ea485ffd2e40e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/465] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From c70da5ee75c2fea8878386c01567d53c2ae8ac03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/465] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From dbf07ba811b73a833fedd0074ce44e4b5d04f79c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/465] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From ac6d28daa0dd73175660231feab9080c224c8cc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/465] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 06fbbbd83c3c5e75dffee56b8a66529272e487c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/465] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From f6df996f8282befbd0752c3354494e3fa458eb5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 290/465] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 302291c14a49dacc0db91a3d2767d03c7c6782ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/465] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From ef203f3df2c896d06535ec517f651a4b6d225ac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/465] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 85b2919ff427faf85a4051ff122c5f93827522ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 293/465] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ef630ce9970d879fe732f905fdc90fa6d7e7d5f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/465] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 3b62d52da16e7fe793475f8c0d2e045131159bd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/465] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 4eeeb2c75114384034ffe2d40df82a6f088ea9b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/465] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 3652620b75d0de53a69c53678e890d7c58917445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/465] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From c57f3c79c8089b248c72ac79629f104d1ab356c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/465] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From b7bc49daa8e62ef4f5d8fd9d489af79c6c9897e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/465] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From a718f4ab03b12e1877097c4c57861e5dc854310b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/465] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 8a909aa18c93b32b9c142d732640556879dfb235 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/465] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1c1a38bd8e166367697dcb8b83f04cc1b1fffb79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/465] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2b26f2c48dc94d917a451454ba95572baa1a745e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/465] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From b7a7646697d4805e4255db25c6fce61675a9bc73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/465] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 85ecbb4933c2c810f007c7bb8d8b72b7343fdec5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/465] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From d9a6c9325a8fc3e9b549e5824ca306c8f5dae146 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/465] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 99857720f6496ca7eb95d5958fb5732a240f1514 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/465] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9dbc85059f28e6818663401c29051e57c1da8def Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/465] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From b2cfa53ed19843419f6701d671fdebe085b6af8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/465] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dd5a062924c95203ea8c41fe42cd0f8870cde2de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/465] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 682ab03ee64bf4b34c03e64c739b6a8b049f99ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/465] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From b075ac001c0b6ed67e81149a137d47eb656e8b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/465] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From cd38cd3817c4309347db91ebad360e84b7133f46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/465] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 50c6bf3c8d397689b39d98484949f92cf781be65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/465] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From ed925875e182d7e0167df08db350dc7ddeee66dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/465] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From c01baa5ce247367cca020930f173e828ff849d28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/465] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 71002bb3e96cf93ae3fe361e61b08e4735368c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/465] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 84fd325eee3d65947ee8e30ef347e9e8c2e910b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/465] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 51d81e2082c23d9d9e7830cf737131d311220f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/465] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4bcb7c14374e60295ab40ff2b032c78bb2df2d2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/465] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From f89c6f30d40791acb6d9f8f61cf51bda77eb94e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/465] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 74129e44d566e84dd27f143297abb695d4e859d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/465] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From af19da2c38e10a6613b81238d2bd5c722a71039c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/465] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From c3dfdb126e0a985bd29b0c7ed40cd88117e7a708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/465] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From c0ecc79a1a009141ebd84a865d40d7bf19f27bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/465] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3d3aff03d430f5d14c3503c1bc884c4ab3c74d40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/465] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 3086a20f031bbf125348e0429d67ec1dd1e1beba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 327/465] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From e877742ea99952e2b5179395fd95430eb136e4e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/465] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 3fdacb26d081aee988e049beb72096c3086ce264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/465] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 395c81130cc713df88d9e7908d84360342185714 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/465] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 7ee4f2bc8403ed6d27d5467cc73930632fde4152 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/465] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From e600aa25d35cbc780ed1206d8853f4fccd4771af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/465] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From a9ca29d92700912805ba92d60172adc444d87b70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/465] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From e6a14d08b7005987fb4a90d7fcdb95e881f94103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/465] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 58522e9855c8ea71aac37eab298b344c2b3b7870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/465] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 1b448d38a21e98a3e249ba6265d779dda4efd9a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/465] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 8ecff76f9dd78d92407bb435d573f1e2819940f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/465] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0970077d64aac15939e84ef8f21884a9e283c2fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/465] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From edfabe1badea396b7c00a96021c8d8ca82a8663d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/465] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7e22941902ece066b7debbe4fa8d922e9bad50d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/465] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 258d76f1077d9349e3d145e91841e08a8f1e6e43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/465] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 4801bf119544788ff094817e9ecfc5f06f1786d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/465] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From b3d4fee48bf52d3584390d883d8dc969745a4fbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/465] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From aa9c1bf72cc1571bd99c7c9d115f42830a2ee7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/465] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From b82ab670cdbf25e18547519132250d0e19c5346e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/465] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 78dc52a5a5b1af3a0da17cdf572bc094c168cf0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/465] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From ad10843776f04aeab200c82de57d3801384c5892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/465] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9c98af6d83c86880300cc128b237a1fa2396e32c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/465] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 200312f7c4d1fe1bd6dc76605cbc788c03abae9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/465] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 5c09766fa66ee4ec938a546fab29cdcfbf723c6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 350/465] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 20936ca57b1a99bc9dc842b43d92c4b1edf416c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 351/465] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 8dfa2f082196c042f26ddd0f3115de5a707a5c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 352/465] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 50c479e7b73dc6c33c8a6e364fe79833d4c07340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 353/465] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 60674ecb2ef34f04ccb712011bf450b6c9c42b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 354/465] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From c22e8d6f806a0cff0445c8c12916d78a1e929f50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 355/465] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From ad602e7d9b8831b1f7611056a6fe97569382c774 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 356/465] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8417efd93b10d302d0977146da119e42c9d327f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/465] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 71acbe79daaac35c82755d09f49517381dffafba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 358/465] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 180207b34e12001aa519b3a62e8166478e29edc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 359/465] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 883fe320496dd33e1d08f24fc463f5e234445a17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 360/465] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From bd0f4c8639f2939884b269df5b6eca2635d53b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 361/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 1a5ff1da324b2d4cc5304ab19e9a8b633b97aaa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 362/465] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From c1b3d041fc7e79156634fca3574623b82ebfea36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/465] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From dc22f2b67faa34a68cdf03bd8f77e8afe2f0b8c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 364/465] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From c524dbadc650b6b2b68b5868602899ce7c2743a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/465] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From a008cc5d6ca185f13a8736b0f417a4a8ac9895cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 366/465] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 52c3f3964ba326851a385fb5576af527a3bbda16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 367/465] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 6f80a3ac340c9aac381955b50cfc6e722735f590 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 368/465] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 1859e962ac4cb803180d352da87eaead294104f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 369/465] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 6f4cd97de16e33cc7a16a676083b9a85147bb571 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 370/465] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From cc4b3cd043fc5a74969f9fea7531ef87ec9d0d12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/465] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ea6a82172f9615a9a707fb7535b3160536e10037 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 372/465] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 4cca59586f4df2b164f3f9a035245a22ecbf678e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 373/465] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 6c7710a96cf7b0f2a32b0c64d04d611e41cb9f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 374/465] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From b886e878863f47d8b65e42882a14c1a28b733ddc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 375/465] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From c672280580ac78fa7bb6869b0362b8742fc91b69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 376/465] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From b745d4e827b46b6c5e26146ee689ab21184b565f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/465] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 7b1f0cf68abbd9ace1c5a156a6b1a0c9c59385f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 378/465] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 30943b719d40d3f2e97714df636327a39624ded2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/465] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 9fb1d47c673c2da0ee34be4606fd93a397920047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/465] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 57aec582b31b7be947eae4b4a66599807c66126f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/465] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 009b148c1477c0ca66e6669ffe9fef199f10824a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/465] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From eb585e1ad7467065575c3393e5bf35cc39f7fd01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/465] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 4770d1e7ad52afa9f775ae01b96f21aa466eba3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/465] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From c01c96580ce879f5f15e762e78282f6c4b11760b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/465] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 7f7a41f1f361d11154d6c999fb71019472f456e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/465] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 86efc9a267cc30110742aec5d2c294beb9ac905a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/465] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 1e70a62c9764e1094d13b3a198ed510983e0a1c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/465] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 1ffdf1efbdded1327e6cae570b02937f7fda3823 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/465] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From bd21d8343ae60da2b7b29c314bee9e06f088d145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/465] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 0f662ddd5677cd85182f65daf9172bc51e004b73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/465] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 1f27eed2b5a7de8545af553fad23af53df40f10d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/465] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 97f8057b7c0766ea875c2c3802c162f71ba1cd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/465] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 11d04a95e4f5a63e039bb97339abe8db258c9291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/465] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 7ed862aef86cca1b87064ea4324344e8772d3de9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/465] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 729be07938adc00ef05ee13b78e58e43c564914f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/465] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From 2cb32a2ca8ddcdf9071dc3b6c85952213fee6af3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/465] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 0466d51df70e35f6d81407cf15242277e64b9177 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/465] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f4fcd6fef10016d50666d1be434fb3d303e29530 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/465] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 9b86cee3206fe1fbbd4a52110c5a441f4bfb165b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/465] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 20b67121ca200f3c4f16ea6611ca647673d93c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/465] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b88740ab522afcc435dc2c4f5c54ad61c577ff2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/465] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From db9da5d328ebfe293486168c40a8e529539836c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/465] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 2e8328acce9d4d019f4881237a268df9adbca17d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 404/465] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From abfe6e1d32db62c72d45cd71e0e20cb959d3b621 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 405/465] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From f0345dffe758795be3456ad611aaf383e9cc3a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 406/465] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From cb24e1a0f49163ef0f5efb818fae64771f0029a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 407/465] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From a481f417c0a53876befaee6d1f20e05dd72c5d1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 408/465] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From bf78410bf82d4b8a23fffd4b7ca56acc7acc117c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/465] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 2051de4c5a508998f89042931a4cf8fa09709f3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/465] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 9eb337b2c78a5a0da65146c91ae377256807f6a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/465] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 042c6f4bb013a3cc8dbe495585893be289bb0a4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/465] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 67a67348f5cdaa375ddad49909d85aac131ec69b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/465] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 612aa265455f710ea8e0a21bc92b1a402271d385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/465] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 2fbd8b5ac7cc869bf7c29765aea6a2f16c0c35c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/465] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b38fb9286df3cd561878db10145a5711022c2927 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/465] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 75d1ad7f6b4762dd6f5f1efc5aa4dd2698c93093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/465] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 12d50007df472324577f40874bb1172466d2242c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/465] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From c9635c83d9412c0ffe80de0fdd6b670acfcf4940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/465] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 407a6a7e4de525428e4b5eae01404cb36bbb6c62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 87225227d5db30bd01ad950a5ad127e976bb5eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/465] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From 3122b23687123f722a91d8042f8f11b7982515a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/465] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 44ae767c8faa646cf055fd37d9d90293bbdd3b7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/465] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From ba1c81d48389e154032af40205abb647958da3df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/465] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From 4298f64cedf588665c443257f223d40adf60aa9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/465] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From cd25e3acee78c583f11c8181dd939b4aa3d63d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/465] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 97d28891c80d6e5e3d5f4587483813c74b4c280e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/465] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 3a3083f5d6619801bc84a64cef02895380bdcbac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/465] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 50ed41643b8f0db44569df98e0d86e551dc76f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/465] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 86ec9319eeaa4389c071679991ecd5ca482b7afb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/465] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From fb516817c6759a948fbca19e374c91b0e80db4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/465] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From d9fcb3e90ce23f443df30cf1595522573cb04c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/465] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 5ed5c15f5e9976b684d73f8037880cfff5157d8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/465] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From cf6c5f8bd392e6e7045ac93c057a48cef4db9468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/465] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 1528f394f20a889a7416ad9afb4d8e76b5aa6806 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/465] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 0e3f9d0ddfd736e216f87ec656f3a56f5fd6ecaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/465] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 8c0d822b6ea7820876477890037701b17363d9a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/465] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 52f4c5ed5bf13e03afca13ae17c3d81c479b7da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/465] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 87f90fb73f87a3db914acb84b61be2ef66ae8081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/465] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 8a191cff968a8521bae5745cc2808f5788f819cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/465] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From a3514b9b629be8e1a02ee5bb20622dcd49adf8f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/465] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From cb2ccd34b35006808f9033410a3ee63c793b9f0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/465] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 4ca3398b382abf06b3726618b264063813b11dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/465] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 8ada7adbd890bcac0c234c08a30765006dac5ad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/465] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 1b22f98dca22201076f50400e5d916ac69aaee21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/465] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From c3e4e1951d112a8a0476f493fb573face5312b6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 446/465] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From d1a4352b67e32cc71fd313cf95b3b943025eb9db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/465] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 8a13b4dc62cf59b482c6fe602043a59fe0d78b68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 448/465] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 0505ece9e694a6bf3c134fec9513b3cb3edbf9d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 449/465] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From f7593d78c67c86bd6779d12b89eada59ada7a18e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 450/465] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 98052a0586c8e6642daf39c20d0ebefb0c1b590b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 451/465] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 96e43df690a64f5b33c4fa72fcde59d56b687e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 452/465] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 2d2f5a614b252ab151b13a8749cc0e213aa0b87a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 453/465] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 6bc0876c24011c329c0cd570b6dafb71eb25e043 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 454/465] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 41c4afe7de3b684b96f7bb24a8cbdec21c6bfbb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 455/465] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..235917ab151 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 563cb77a15dafd8613c25ac0ede14e16b88853ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 456/465] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From a64b3082a3a2ed9119e25b0d9423c8be13d2d156 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 457/465] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From aca894dd8d90887cab4df8d4482feb0c38463a8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 458/465] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From aef30aec2061cced2750dd33c8907c5ab8f46c9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 459/465] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 5dd4952e003074e26eff07dba5fc8dc796d8895f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 460/465] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From c0b8fd551daf20f65a649cb6f993f192cedd1fa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 461/465] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c5c83ab3ff1..451b8b28182 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.176
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 402c34350e7ea3a5c5cfc4e3da1baaa2daf2c472 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 462/465] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84498596e21..3196300abde 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.18
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 30e45cae79ced6b2006ec0882c7b42d3a18a0141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 463/465] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b35edec41a0..6c326fe6311 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.99
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 9278d0262ceb97a68037a0cf41870c89e58529b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 464/465] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 66f5b611bb93ccbddd308390fe3964025b915e75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 465/465] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 586150 bytes --]

From 3cd1007b3a7affd2b74ec8ce55cd93637e611a43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/465] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 959f1692961..7c4bd4d8f39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 480aa9b961595fe78f3ebe966812b15059cfb32d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/465] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 3d0e7a0b4d0685cd194849b86b39b92b4fc25c07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/465] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 10398688ce06a45bdfaad99d405a0080d64227ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/465] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 082bac133477af266a50371b0cb55642cac74f09 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/465] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 03491d51359849b1b1e504841b866329d4d64ad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 006/465] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 5918565c13a2aa6c187afb2cdd81f61f78d38427 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 007/465] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index 7c4bd4d8f39..e89dc533364 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 3c8055d78ba08ac935181c6afcecd9fe54a741c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 008/465] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index e89dc533364..213eb78cd7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From ba74755a3a910fd6f9728a785071e4a27549767d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 009/465] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 22c50e3a4899ceafd5e488d926a4f6255ed8c9ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/465] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 2bab20b635f6aa507ba85aef587834ffa29f4602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/465] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From de863650f7aa5c22e8a418cc53f0045870e1fbc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/465] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 526944cd2c9f7ff913232b67d85101ce600c701e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/465] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 70cce727d7c66fedd8b57b66517057f80039da36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/465] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 45787dbf92979e8b8621324a79c3b848cf46883b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/465] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From ea37ded6a055f06cd7933b139c5c90ba7800e179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/465] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 51f6816c5953ec94d00c6e5f28cd6afe0717e5ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/465] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 680b673f49e66fcd4050cb764802a04843632315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/465] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 5884799a3ac5e6e0a94c81a8d756014172c071b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/465] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 683b05c3f06de4279f75bcdece5326bd064c3a85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/465] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 8b739d6fba6081d590d923d816759a96074a5738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/465] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 0beb16d6fe9f8202396b5359730b2e6434df6809 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/465] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b8c7a98634e12ba897efbf037d47dc51201340f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/465] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From beab31aef37bf6b34fe61b6998538a4ec4c4a6a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/465] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a3b3595b066f36c15592301c81ee0093e4d542ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/465] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From dae5dd07a9b010a971cfea70fe0275ad7d551c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/465] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 2aa6f6d80a397b1072534ccfd4a0af45f7292959 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/465] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From a47958f54962ac13148abf3ea6a63d34939aeaa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/465] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 89cdd7188f4f99734ca19800eafcfba07989b6ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/465] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 5c3a2894dc5b0801c51d47ea572a0df05f73c119 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/465] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From e648662b05918762557e8bb599a95b7d366719f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/465] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From fc8a2e5e5b2c1f7f922df48056e298f4a74bdfd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/465] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 0a6af3f951c7480e2e07c4a2a1f4731ce4e82dce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/465] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 2c4f9248e0c5131b2af09f316b95675a89803fcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/465] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 9a51cce16f8b26b287cd646f9a92cb3e4bb5e535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/465] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From aed764fd86d1da06131bb5c545ac5a359e1ff9ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/465] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From d232984576cf343cad6b4831fd149661b77f320b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/465] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 21322d9b31a32b78a5b542c998b8d77ae869fc3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/465] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From d345a6211294a0de4ea08561843fe3c0c508bee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/465] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From fc6373468b0289573e522eb81e4372318e8328e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/465] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From b9e78fe939540d1559377865bf9d6df81aca983a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/465] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a41987db399b26aa77f663a7698783fe1eb7d6d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/465] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 693bfc703a48cb08f278db5e6d68edeebfaa0f9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/465] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From cf1302419b7b106461515eba892aa7558b6c389a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/465] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 7e2a97d008c1fcd656dacf1591e6ed7c62ca7d81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/465] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 27d5b40a3d7af27de93482908f48b96362feb3fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/465] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 69dec1e4556885e9b49115ced82bea938f649757 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/465] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 14c7b207326e6c1cff810386d4b42ca86900b59d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/465] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From d0365d219056733b18fac3e937755c1b4053703b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/465] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From a17691d125ce5082cd8dc977963620eec7b4688e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/465] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 293d324a1f86ffd7d5f53e907ec47f3ee955c36b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/465] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 97d6a901f7bfa50f0201bf860ab8a87c6d785aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/465] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 9ed23f683e8f1010ef0a602fd02f41017a91328d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/465] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 42d4de3e914170ea2ae7fa8d00106ad6749898e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/465] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From c95ea286cbc7deb3ed42feb21dd63805087dc72e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/465] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 68d15ba6276b27ef58f67978e34386d203628da8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/465] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From cb76492462376f9a428cbbc8af1bf59a42ba32d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/465] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 6f77312b84c14e41673948d746489e3de04600ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/465] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From f60ba77a260c7c2acf62361fc6c78485623711e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/465] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 60d1ad2d1cfb6d614a67887118eea2c17f5ece8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/465] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From d391543f7a67a0f9323203536811404b8da588a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/465] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 5ba10f4f5456fd90642ad74ca2b32afc8ca4f7c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/465] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 86f487c44bee2ab705821855a87a0e4ded4ce1f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/465] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 377e09182946606045d2e923e08357291ccde1ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/465] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From ea022cc0aa027cc53fef1e90565ba920e6781498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/465] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From bfcdc950bc1ce8c703533eec26f6013b6f88efc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/465] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From e1c2a7e0e5d9b879c5074f02c4411987933d39e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/465] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From da77b971f6e7cc4ab1f009d2b61dcd86cfbe40e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/465] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 2a7108ed0285826d77d5762ad4c49a5214c28b83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/465] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 9130367522fb3ee66596a7c0333c06f5c0262d21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/465] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4b54a63d97c8e0f22083ed27be7fb1f1f90d9c3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/465] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 5553328ecd1688b7c87bd0a3e7f4debc8970fef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/465] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 976c6c835a9c4ce334cc1580d875008d55cd459b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/465] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 16545f0316a53a45cb678fc3c9f4b548ce0de572 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/465] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 44c3b7122a442ccb1c0195869d56208b556e0359 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/465] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From c0b7513b1c864167bb059af9b38191829979805c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/465] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 2c90de34877a8c3391798f2ff3086adc471cf0b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/465] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 5991a15b0927e815578e79c0fc36c741c3630f32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/465] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 41b53a87788bd63088a811aef653870d11af093d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/465] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From e5e356840062b773fe5e353fa4a458f03dd038e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/465] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 3f4e7c66545ae3f8fb9a9e09dca74ec4b90fe1a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/465] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 86b1b3bfce2c5c566ad9057ce6bcfe7f6795c9d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/465] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 89c0683c02c8e04e7c09cc5c2d9940b791e3b623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/465] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From d10f25878d6af2081d53487f9c210df3a595152c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/465] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 36e5b42eff1848c3bcf2eab0b4bf81738fcde624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/465] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 0c5d27053ea237fbff7ca81eb53b01589f123471 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/465] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 5f6610d3532fc0353994705bc5d324a5b8482f4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/465] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 6d4e805e29b801a2f30ecc19a03b472f0a846e11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/465] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 5ce47a1d1e6fd1e1ed18e32378d04ab613071720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/465] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f34bb23a1b8d056004a147479c17ab2dc5ba2e95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/465] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 6bdf853544b203e0b614bf494aa6569cb1cca4e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/465] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 221e5a4082b33d6c867f442145a8d08cf61b38af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/465] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 9aac988f45b13060fb1023f111764868ebd868a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/465] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From cbcee90f2f0659ce9f946d84f1485f0ec36de08c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/465] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 16127f8dd6c75b4a4c7f93bfde820c0c332b698b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/465] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From ed625e7e98029750f5f38333a3ed03629ef73762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/465] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 3900a436c5888acdda183b567f2a6d2a996b9f76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/465] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 4f8ef29c39096d98a3bbcc1c599750726b3c4c49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/465] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 8f635753c2a689cbd880c21104e1449e2a809938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/465] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From da71417a8f02d72acda1bd39ba717bcd1cb994df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/465] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b61700412c4d351ce4c9aba3255454066658e68d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/465] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 025f3d0be51348854ebdaf9352412890d9e86800 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/465] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From c95fea1e094ff620131c935e872c8082b711f272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/465] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 35156339081e71215499161a7ad749ac37118f9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/465] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From bbe8bd67b575cd03973e41ff1af0c7111a641cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/465] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fee855f665d0074e3ed2e4b02cd2b2a43f652274 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/465] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 565762d30ab31ec0f839a610a9581fbf4553e169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/465] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From ce7b6812040c175a7d3c66187c1c0c22b458c7ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/465] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 914d518d877d9030a80a9a20db16badc1604494d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/465] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 50a6bddc917827fc51ba0adfb6da511980aa15f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/465] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 31e0e326e4a3bed1401deb23aec6678ea2457fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/465] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From b96ac4d9a6245290c283a0911adc6b5b17deb330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/465] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 0315fdabcffaf095e20997130b3e01d6155008e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/465] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From e8d7f6c61601edc01f17e575d77b0fe506d47b6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/465] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 3c17312ff7d383ee2973f536c999f86bc5816d4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/465] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From e3b921cd40fedf31664513c3f2a5386012b285b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/465] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 9120b049a1174532e8b12a4bcfa843a18b94ac93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/465] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d9fa51b6850c3447aa8cd4733856efdf5c158572 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/465] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 679c871227cccbfb9c47e46200b7402cd26ddc0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/465] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1f3c5cdc26b153bec767f1e860bc347ccf01f26a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/465] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From f69ebb5ccb93bc357e2d684be3563e2054a4810f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/465] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From ab642e0b5b5aa59e554c2447b5b01eb9e7f53085 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/465] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 86427b9ecc79386acccdf419db81451154fca544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/465] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 87995362fabe9dd56343c8a959a967323db81949 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/465] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From b261965a6e2ad81b870e744202045003c5fa2893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/465] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 7ee49a33b63705aa3e93d0436e04734083e4897e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/465] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 4c5740c06a8b458c5388d3220077b79d1f66b7a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/465] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 4bdf3239ae4b194ec2a2bb879779700ce9c58183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/465] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bb116da4986b03b014d0986226c4d70e34d02800 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/465] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From f6770277caabfe6606bbb30dbf2d47d75b9a7c20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/465] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2da7c3a85d508d4752ea2e84c8a9f38ce9d473e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/465] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 4510ca3c1e9822a363f7fb529578d33cc1d852bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/465] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From cbcd47e2d5d8c37aa88092b4e541f8cf93854687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/465] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From b2d57bf52e8689c43d65f9e33bc0917e51a5a2d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/465] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From abe9502c7768e0c9597716b6765aac59325c1de6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/465] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 5d8405f481047d1f35fd9f50ec191ae5d1c5c2d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/465] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 28774d93854764251df8e326b5bc428a92135bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/465] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 2c50c462bec758e378f6d93beb2fc2dccb4cee8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/465] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From ad1ed7c22dd7c3736034eca6093e5da7a040b3ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/465] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 11de484ed4366fcb3f67d23dccd557072f624510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/465] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From cb1045b4b90abecb1c4249e3ce51c9a17d1947e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/465] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 2fab72cfcdcaea5a08a15b6311ad5243efc20b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/465] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From be07934fa50d821f511760a778be6b6d36e10659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/465] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 8c29818e14a555f2b11316fae8936c8907a89709 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/465] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 1ac3c6381442c5023384a069ab476b6be947716d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/465] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 766ab6a4ec775db2ba95b75c7f59414bff0baf18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/465] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6b53e49e7876d9acaa3d293d8b1204ed4a9c0f3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/465] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 57d39685df0fd8458225a445c6d9bdf388c58f1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/465] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From c4454eea41765b9ce22a90c49bc6c37b1acc4310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/465] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 7c48a0a8d7c1fd87b61e78bf840623a1783ad504 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/465] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 3b5258b37e70f034ce204171aaef66bba6579d4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/465] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 64a8937b5abd3871f06870f6949c618a2886a24d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/465] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8330b9dc33ea8ee807bcfc3972cec93be5149872 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/465] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From b8f4cbae593575d6870861f1065979affecab1be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/465] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From c1a0b6544a73ba59afddcc8d6435df100b175038 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/465] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 5bf1a398f8b177fa8f9e5233eaedf516335a52bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/465] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From e3388290eae3654e1334df9bdfce067788b0adf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/465] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From b6110eb277b4294a6922e8762a93e5d011c7cc7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/465] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 55c61854f074aa2449783a5072abceb42406c333 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/465] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From e0b5e66f576dbe7816e633b235d8e174b194a1eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/465] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1faad003d62a1f90841aa06e8e2c79effeb3b254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 161/465] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 209e5ae0a9c670c03c40aca373e83b9b4e96c821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 162/465] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 06947a95ea08dd3bc5b017649b63173db9c4c84e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/465] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7302f492d1f57cba95022c25593e7489f7150dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/465] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From e9d40007ee1ba6763c25ada46a36245834f667b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/465] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 8396a3a36808924d8592000a7c58c6d2510a7db0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/465] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 2f631610f4883e69c668bec5a43af36000252902 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/465] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 0e68c5cd99710d26626210fae8de3560f919eb01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/465] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 045d889bbb3a7591a57248bca896110e1bf2b394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/465] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 817ff0cdf058092127ddf1de9ccb4df024e3bbc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/465] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 2e3036193cc4668078cfc08bb62433c091d5280b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/465] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 304218efdb183f948503e8498e72375a9a6c71e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/465] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From de9e9ed1cfd51d7440e9258a3da809e19a5a0544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/465] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 0f111d32c1f880f8efe81c6e78197f8cfe683c7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 174/465] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 7965322dd605cca96551cc6bf66a7995b1b6ef3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/465] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 24582663fa862b2282fde6f020eb3c7462652f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/465] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 6cd53142a28973238dbcf7b65464bda90f0ef588 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/465] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 5da59d3d93f86150db016342c8a7aeb14b4a5d99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/465] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From b0366a776e726de9bfe1cabeffe158b7b7f7365e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/465] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 8e875cc6528c1303abe7d4c7dc86ccd3a306eded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/465] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 768ec51bdebea8da29365c12bc00d1de6f545ac4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/465] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From c86c3e954f5604edd5b53a2d2b9f35c01c9989b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/465] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 5bee0fd4100abeb2961cc9bf1c97554e2538cdf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/465] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 62896e9689cfea16ad8765997472c40a0fa15f84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/465] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 3af253d7b66beb368af0f47c72760dea583d7e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/465] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 864494a52d6bf9545fe343f12af485b299e65cc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/465] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 306014501bdb6daaca99ffaf8f5aeffd31247242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/465] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 81ef246ab6400ff293e184ff03fa2fde7ea10dbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/465] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From b9e4f7964418e76fdfa81e50966a9b027ed09c4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/465] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 8bb58302fcf6291fac72d0fbdaeb721c51d35b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/465] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 7811b5660afe141780fad117d7f485b999244f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/465] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e8540599233aea68d40ea02994f6ea012816c7ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/465] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From ae1967b1282733d6ca9c41d16f9fd447e0cd0d57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/465] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 89abb64817dc53a1a62980f2cbefa848f68536ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/465] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 26309ea09d9e247621963f54e0a920111a136f1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/465] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From bbcd36b14152b340cecce7f6eff9eec0dd9bc2e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/465] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 726785bbd6f1624e7eaf7c33dcb031ed5e7cc7ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/465] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From ce39460caca34a283468a5d3c03ea900e55e5e64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/465] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From ac9183aed153349b4c7aa3730553ce71483ef827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/465] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 75fa19987edf25dfa7230da6f2b38a1f93261cc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/465] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4840f1c5b00d9d88546e4d97736e1ba84a78a25d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/465] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 84fb23cf41124bd5e397a68a9175ea9b434ae95c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/465] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From ce3d7c00546601c286ec903a6b0e9a518a0ca52d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/465] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From f58876f5cd9b18e5164839544e71acd476d268e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/465] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 861615986f687debf24a0c026f84891e3a3b9c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/465] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 483ba6d94ed684f3ea575911927a557b4c9b867e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/465] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 8caafff2d7ae76bafbeff2f65f4b4fb45855579c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/465] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 3ad9f345c6de352115856bc124de53154f886211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/465] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b335589b75aa2241d6832edd0a19b00bb7827928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/465] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From a5d640644a3cee05af6efd694d5e6b5cdfc5812c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/465] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 5717a8551f9fa9dc16d60d5def8149e8ad4856da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/465] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 432de1055881e67be4d55c89368f10247866d668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/465] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 9bd830708940987a024ec436456fae03f8084dd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/465] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From cb4089d3b3e6818c6f3dc502c6be2daa7db02787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/465] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 990cde045b1eaefe5489e01566db6bade43a7e22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/465] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From a44fe5608e1e8b744503b48bccba25c38ebb607c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/465] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From df68dc9aa1b4ea14bdfb3e96dc1ff433ce6f22cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/465] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 7101c1fcaa6f6184a5539e8f1be3522dd8582c3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/465] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From d8248ef981826bd623bcdbe9566ccae954bfed51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/465] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 287354cbd07ec3b2f8ab6c43f7a386ba2b9dde61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/465] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 6bbb1c8064b6153af9273e899d7d5ae11b4bff48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/465] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From f755612521099ffe9ba2349a6e0ff528cd3c8588 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/465] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 1680b4901af0fc93361f3931c53571717d13d3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/465] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From bd43cc01eaf0d624dcafb934f2ec2dbbd758fc42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/465] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 3d56a10e6182c7016601f313f2fefa8effcee2f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/465] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 39f1e83ea69e1eb57c3b89c157e443daa91cdb48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/465] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0efaab6d1a0578f286f47ef587ea1e3c871d67e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/465] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 7be39155ec1710944c573a4ecb26048be5232a28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/465] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 44f762ebde95295763bc6befb607efe25c903de9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/465] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 069f6d05050dad7545736c78c3f65572efb98795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/465] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From c9d84c535096df30e5a4f9235f513f4d6255a365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/465] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 27c3957fdc085020b6cb88e84d23f06aa5e5870d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/465] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 98622659f39f3ee9475a03203ef2e2514b4d2be6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/465] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From fb9bfc75a2306b989a52b9a91ce6f7d33c77038d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 234/465] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 5c9d4577e6e8de66073c5f7a7a755f8bb99a3e3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/465] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 45e66a3e95289f36d53153c4f66572bb394a27ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/465] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From b26b28df034de0dd9ac67acee21e207c883eae62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/465] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 08254c7c288dc73c691be2674135714bffd638b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/465] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 05602b0ae4d14d6b8ec5523cfe8f610cb948d85a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/465] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"

From 6fbdec097a5cca084b7c03682764dad4f5c44edd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/465] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 91f19b920ae9ff8111aa25b02189a3ccbc4ddb13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/465] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From e33dfab55897a57cafd74e4a938e1f0954c7c0dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 242/465] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 90872b2c23bfda0d471a3464a0616d763899b5c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/465] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From cbaf3176a23bb3285417bcb9be09ace84a71f67c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/465] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 8236f878f90ce0e98988d8d730ffbd27313aa432 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/465] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 3a70ad91a14db8ffd41ea5584cadfcf39dc88751 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/465] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From cb827735b0bfde8151a323ad0da675b25177b9b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/465] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From ecfa6b395cb2a63aa7ad09ce8fa3fb5a33007bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/465] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2afa8079bd1d4365ba4c694eecaef13ec38ab880 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/465] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From e604971831a7f7326feebd7ca7e57ea8fe6ffed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/465] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 6b6a122475264f4ba07047256b5aa55bb4dfadae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/465] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 34b1d16f7799275db4936b14f530139fe1318150 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/465] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 182986e9ce0e35913747412bd6551ac25bf1e137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/465] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 1c015e5ff92241f976f6e757962cb45ed21eaec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 254/465] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 3b379cd7eed17f714bb0813b7c779720ba9e5de8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/465] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From e1329a566b66db5ada388aeabce8a45315d12723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/465] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From d6bed70486df1d4847a756852a53c1ee5bf449c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 257/465] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From ad4ef8181a6d80110b8fbc3ae96f081dd10bd103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/465] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 6e16c497613160cead5debbda6770d43a2a15fc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/465] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 5ad8f097d43f128b5d79c176cb6ed607041d44fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/465] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 4d947337eb05fcd9e1000601c5b13324542feeb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/465] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From ad4bad22079643cdcc71110b90f5bc70cb5f879c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/465] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 7606a2a669c18a689f69a8617de682639fa56a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/465] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 6efbe047a441483ac38a8354b47459cd62739018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 264/465] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From c6e41eff204b4777769d8face06c9ac03b22d109 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/465] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From c24feb1d385aed33b678a3a291a6e9c1e3116e46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/465] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 441694971d5418b2e67f7209469d0758bb083d21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/465] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 83f9fbea082838b8603b18fc2ea7ba0435c13a40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/465] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From a024b0efb851fdfe64491de5e97e709faf2f2638 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/465] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 1373cce66dd77544b9b89cdea7873c8fabe0e72f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/465] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 77561a84f7278bcffe6d0321b980313c26c0a92d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/465] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From a8db60d48649bc620a64f601f1db7975aa316f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/465] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6de13b6b4d34b013f973e7af6a694e5c7508b236 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/465] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From e08a005ed7dce32d80caade43ad3273d091ba941 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/465] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 40d0bd70df04cb250762e30975b9af333d005487 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/465] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From f79375adb4ae0a85a7ed1188966ba372598686c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/465] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 742d23a89f0d643b1befc32b6e9e640d9e3ecb27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/465] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 941dbf8b2a7fa35432505f7f6e337440c5728d82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/465] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From e81356d1985a115a292d71b0bc3c603c18f8d79b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/465] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 72bcbf1e5dffee98d41aca7e1b7371e9f7cac989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/465] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 8efeadd7893e92ed60e814b069eae4ba3efa6f93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/465] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From e2477b67a738751b406d77a293532f89e822145a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/465] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From e0949060f28417bf23dd67826bc2030e438eb912 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/465] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 0ebf98bdc936d5e144d5ad856174e7722a976344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/465] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 0340ed55ed07bf1d73b50fd7f0ef255c46c306e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/465] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 5031339ce4f33a9b953d3b536cb3b2de04f1957a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/465] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From d4db267d8769aa689c2b4152cb14d076cb0f085a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/465] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From d07ac86d46a19cc2d1a2b0381ccaf95d6ecaabb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/465] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From b71070cfac479e3cb3e69b69ed7fd0034ddf2afe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/465] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 3f917a4fda5ee544d2ddf3ad0361f965bb6e6a31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 290/465] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From eb6b166d50f2c479a42f66eff3f564281a44b449 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/465] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 3a9df3d0950a5d5b152c81598f55d21c7616dc2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/465] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 1923640f8ad2cdb2b287715540a34811414f5f04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 293/465] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bc644cbb5bb24b67876048e741743500b7bf9a1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/465] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 30c0497bf3dd42d1b25a9db0ac1bf62c351ed3dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/465] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 93901299223a8bcad3b87c5babe594d0240a197d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/465] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 2696dc7b8e7187bf2ef7f8997d6e632996d9f394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/465] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 95f94aa45ede9d0ceb18504959d5f77de17532e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/465] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From a2668592f7145835da5c354e31b6fe80c4a89d24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/465] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 0c60f77c41b7219512c943a27e90285701414c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/465] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From f9791be88b3b9a2957b6a3e5421851af2910e850 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/465] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From c24bf4ee1c34938f0f0aaa91efa278171a051c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/465] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4d5077dbc58cc3cc958206e79cdc11acac5067cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/465] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From a0a2e3fa2834e125082f70a6eb1019122b6e43c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/465] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From b3d5903d0c770e2ccd9975b468b1bf41af6e65e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/465] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 10a4accc9ddbcbea459facd1ff733fcba6d4f169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/465] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From b36005614719f6c3c6f2f5dee85fab1ceb1746bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/465] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 966c66df0879bc0cd9c831f13be8961b7c1e13ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/465] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 17daec2850d766dc875458ede3ad9c2ee1cc3e48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/465] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cebd35d6377d7b0b9632db9394f01d0139aa7cb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/465] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 929eb18de714b9748d5d2f835fd89921a96722f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/465] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 91bd8afddd720338cdf86323dc14f240aa5ffda5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/465] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 2346362e175b0bb645e7a4c47ecf0256dc18032c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/465] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 00b9b7cf1fcbfb5c3d50598763d4cde46d2381a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/465] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From ef449733d99edbc36e22758306f96da8870bc994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/465] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 70c49a7666499478efb508e0a22bd27bde76c51e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/465] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From b2b55953c6d28c29f0f94eec78d286a576bd7b4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/465] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 060ef4e968dbc3fa4d18834bc692757b8c127419 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/465] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 3cfd51a9526b995f3e3755e88e4befcb6b2dfeba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/465] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From c298ca3c2dc17e6714e27fa2e53abc1dca544dc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/465] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 175eeee4391a4aa1e7f7742aa09e6b09e6662f4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/465] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From c58c57d807771617b83a79b3115f3dce974b2998 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/465] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From b4f6fcb4b6d4e1235ff4c292b0f33433702027c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/465] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From a78d45b77125e3be42afcf296468a6d8ee20942c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/465] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 641befe56457abff375c2e1e498d04f052ca5907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/465] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From fcc0b439f3eb9ac46dcf898276008ce952c926cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/465] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 56f502195c4ee7af5f66e9da012c8b792879c3a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 327/465] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 9886f0b321f94437fdcef54ccd11392ac49deeb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/465] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From f4216082aa413c26ef2b63541813edba43212d36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/465] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 274f0acf3c17677b6b587487c80e9c81f45a4369 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/465] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 7344ae5d6360cb0b61c95578dd213ad4237cde26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/465] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 51c8670df098e3b9ded7417b61ee99f63ce8c29d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/465] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From a14b2b1859808e4aec8f052c3aaa543b055f59db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/465] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From d86b5aa55c2e441bcab411e787eff28fc10086b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/465] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From f8fbfac4533f2b8a44c32b5dfd0ac840aeaaa3ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/465] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 9f66ea05b1d8c262d3c4b8013c861379191eaa29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/465] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From e4e0d3264f0a8de4768516625a9efc2abb6716cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/465] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0f2729d1678ae9617a160405ff0c916d9a39f99f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/465] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b241e5f47fee697a3e63e5c047cf891559747dc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/465] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b5ae4246b4843f26917ef89ff5695231288f0990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/465] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 5fe463916cc891c988968f9dd1aab5335a465963 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/465] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 3cabd51b9d602a436289a41c5314822415514f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/465] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From acd4f1a8157acebdd3a085733cfe6d5822192d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/465] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From d3f5ffdb1d638bd6b13578a68d5a6203bba87da8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/465] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From e7ac64f865ea0a16254a502190b917e3388de6b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/465] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 15d0672c81c64258677833258d91171c6d798761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/465] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 360bdcbcc7b1a8c4de2b47f65607cd5ea9fb6b4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/465] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7ff11d7c5bc6d10dc1cee4d362fc759046fa00f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/465] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 3c0e38b5162f98234f5960a4f888d0cc711777dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/465] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 7832bdcf8670086ba6d99d7fc80299e9f89e3ed5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 350/465] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f62c015dc8b90b66aa7183e201cf3d0d91e45cca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 351/465] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From df8b6b1dd85ae305a5556b3249d6208c3c64043d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 352/465] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 7ecdc1bdc1020dbda3e57337cde6b5a963b56103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 353/465] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From cfa64529d2c27bf2586805ed95e259f54a0f1b70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 354/465] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From db37efb647a6ded533520bef5a160d9358f2f262 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 355/465] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From e3193281b50f7ca022f8700a3850e9ba0892c267 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 356/465] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From c5262632a32972c3f0ef68e3824ea25314c062ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/465] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 163415f23e34d403160d6da110d89df5b5413016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 358/465] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From abe1a924383a8362cce9110d649ee0237cca13f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 359/465] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 7d8556d33b10cf5913110eee1c4348ef013b92d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 360/465] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 354cfd9d9f90666c82a12e98aeea131fa6fff185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 361/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 6ba7b44be84ebb4980838c5ba2178f4bc4bedec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 362/465] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From fc47c00ee207937e5a8b266eb72265d60a3973a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/465] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From ace26ba22a3941d38a5a1f01654745895d1a723c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 364/465] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 31b2d11c49ad8be643ca7f8c91c0d07b9d8bbf29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/465] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From fdc0880c537cf52994c896b567c6dcdb44cfb389 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 366/465] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 186be72ddd5cfee06a9fde6a21f61a72d3aef41c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 367/465] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 5ced0638afe1fa05915dbb0a8aaaaf601a5b253f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 368/465] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 05f7b4b73d0827b54e09113cd57e62ecf5827cdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 369/465] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 1df1f9e7f70bd8ae65d18e54f229522c37bcd00b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 370/465] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From d136348f0418bdd33fd530b1d06a29095460d9c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/465] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cc5eadb57b2e708d39cb766a5d61bd619d066e2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 372/465] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From cd960bb27314e965b07ef1301cd0fdf45d7c4928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 373/465] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 2b1644cf9ffb7b8e74b96982306a5bb1009ca979 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 374/465] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 5e6d7be92c11f6c735163f8842cc3e07ff924124 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 375/465] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 453e0bbedfa88e7740768e94f8123d60c16d385e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 376/465] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From d2778b0e6366abebd498a6968c1a43fafd21602a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/465] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 70f59ae2784f836ef2c8ef61cf894ff0a855ebd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 378/465] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 4c04f0f56bce0c16e23c61450adc9a4930d47eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/465] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From cf278279e9a8a82d187db15b6e77b4b3f4768198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/465] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d982d2b4ab3cceaccad35242e354aa83d5e77614 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/465] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 40506f911e9258ddcdb973f680c18a0166150f40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/465] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 7fef5b2929ce8aee6f3251a02b411f866133b9e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/465] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 17e5a896b1688ba63f3acf8b711ad8a4d7893d4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/465] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From f7ded092e366a878a5ba3e11936b57304ef8dc27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/465] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 4c087d0286b2077b86799e63843c4617d0ecee46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/465] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 91635e6196a79d28f0505e2a61925017655ebaeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/465] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 6e974ac0caa67f767790b829973d95fa86a16fc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/465] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 97de85ce9038662dd909a86d2c63ccb43f2ca64c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/465] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 815f7bc5f87a96073c29fc6daa253e53de434fd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/465] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 5425e46bde9b83ca11378c91deadb4c407f71534 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/465] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 5f9684d2a0c1eeea6bdbad63562d6d04377d59a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/465] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From ad20f227ac6acd79627ac928121427b8794d5826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/465] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 9329984747d5df86584776b67eb389abb638ead2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/465] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 2e3c75316b06e736faead0664d2278f56fd6a03f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/465] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From daa6509d2dc23ac77601c175e22ab75526d7b2ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/465] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From c6c480ab22fb4498b78a78a2e7a01f15a404b808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/465] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e1e6ab465f606e15c244b14da5c1e00c9608d967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/465] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f2dff2138c84d2d4a5a273e3196ecb90915581fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/465] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 592f808bd495b023fa9a2ac3c43c6b8fb7efdf80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/465] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a859844c6d15e34d0615fd250b845ef50f96964b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/465] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 731b819138dbb043044b6f863d64d23b077b70b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/465] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From d20cd17f3e60ed9d859b541a21b4f969320aad4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/465] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 321b01d179bc2c95f108dcd16d13d9a08ae98b50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 404/465] rdesktop: rebuild against OpenSSL

---
 srcpkgs/rdesktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From b2fc30602e1446044238ab028870384310809e65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 405/465] remwharead: rebuild against OpenSSL

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From adfd5c12cb7c8586e3bdb9846583dfa9e91771b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 406/465] rmilter: rebuild against OpenSSL

---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 70965c8a68808398a690f55a56308abd97bdcba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 407/465] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 5618e95cfdb5db41f2a8fb9554087e5bba168c3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 408/465] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 20657690b5b761cc848214ceaa6869bed523e7a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/465] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 36389829515ac33fd490a59a03ae405c479058a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/465] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From e2b3c3eb70aa518bd2762b9890fd82443dd4cbe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/465] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e68bca50cf1ed9d11f51d12781a6fb30146ba8f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/465] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 6ba91ac4fb5e22bb41bf75b7d3ca3c0e281cf7d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 413/465] tagparser: rebuild against OpenSSL

---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 3cfd6e612f00f12a37177f164ff365f89b75974c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 414/465] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From d4b63a567e3fbba5635fe9fa4e05761aece43deb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 415/465] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
 pkgname=testssl.sh
 version=3.0.2
 revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 8187fe73d4255bae2e891acdd8826277bc1107ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 416/465] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 96b87bb5b0889d9bac78fa25fbc220ba8c50b650 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 417/465] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 82ad581239e8f03d655a4cba37291dc86237753f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 418/465] websocat: rebuild against OpenSSL

---
 srcpkgs/websocat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From bef4c10bf803ec7e1dfb5ec07febe53996b48862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 419/465] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 6a34064794ac410f0751fd8bbb6829fe3d36ae49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 420/465] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From ffbf2d606bfba204b36b781d57897e6c2616b55b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 421/465] zathura-pdf-mupdf: rebuild against OpenSSL

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From e91576a03c17899f403ae6b91097e491ce3c7c2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 422/465] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 346a17ca2ea7c3feeffdba6821c3442fa56479c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 423/465] zola: rebuild against OpenSSL

---
 srcpkgs/zola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"

From 3c0c5e8e3d9c27baf1ddcf5b1af67b17e6a35547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 424/465] libluv: rebuild against OpenSSL

---
 srcpkgs/libluv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
-	hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+#	hostmakedepends+=" gcc-multilib"
+#fi
 
 post_extract() {
 	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in

From e11f8de11d35ecf7ec8851d64b531d8f92574c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 425/465] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From f4ef3492ebe5f9856c3b6a53a1f6bc628045efc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 426/465] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 433d8932f43f8528bbf4eeb220543e54b2c02195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 427/465] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 44195b8dd4b36cb5a882ca2d44dcf1ee54ab8895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 428/465] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 6bec196d9378bcf5493530b471358445ec334bd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 429/465] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From ca60662a61deb504834feb09473296cc4b172684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 430/465] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 875fe722fd845d53a264ed5bde4a6a4b24e0ca4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 431/465] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From f530a87159b69853748cceee71b65b8d690ee64d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 432/465] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 9da8ef1a0aae822c94b0a4db2a647b1584cbb52b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 433/465] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 73a9f2607d27eb1ffb261acd2f654badd84db0ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 434/465] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From e1a331adc06012e0d6b1173f8b0e0d03efb02ad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 435/465] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 6e14bb723000daf0b08b2797f7798581096d23d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 436/465] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 0f6829a810970049bb3d47b2d555421b9e26f89c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 437/465] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 9708feb2846b2127568e5630ba60d5bf8b9fd633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 438/465] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 1e0eb0ec4a4aab2062ece919da5d1ed84858ba21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 439/465] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From ada85017e152f19eac584f4974bb5c1b8613502f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 440/465] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From fd6dd6cdeacc21af05baf2432988cd297e3cb4c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 441/465] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From c7163254ead4da048e92e3e3e209798158beaae3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 442/465] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From c8bd12f85f4952f2d94cfa1acec7328a84f20dbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 443/465] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 0aa16c325ae864b1fef62b8ae9ad922937bea2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 444/465] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From d0dc7d4178904cb5d6955f4f9029dc090fe14778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 445/465] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 3ae43585696b2564f5629e734a3423278aa0eeb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 446/465] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 1c18420ab24ab7f38326ef7f3fb8d035cb94a7d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 447/465] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 83e589e8b0702e55ffcd1772f057ae499d460046 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 448/465] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7c47ba6c2fe17cf8eebe7cd462982f97dfaa8368 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 449/465] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From b3e54178591cd6efae8dcd61d5aa128fef57b9c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 450/465] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From ed505bac95b9c13520d1217871f29bb6756c77d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 451/465] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 73c78438012604643fe0916117f67470685d14bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 452/465] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 9de7bb38131ddbd83e7d2322517baa25cc8ea3d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 453/465] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From ba45928abaa9c440045ecff0aecad0c5ddc3244c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 454/465] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 7e998bea639138a9033655b0a0b65a01ff73a13e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 455/465] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..235917ab151 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From c21837b7efe3e83c71a8d6069503a0ea684a16e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 456/465] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From 82cdce8ba0f04531c6331720649c81a88f2d610d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 457/465] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 75a00e3cc64197b90d6ef3b336578debc7eb6eca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 458/465] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 1efff11da3667cb7b1f00e96312902b79495905e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 459/465] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 074d3ee991271c03423bfeea80c6df3e57df621c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 460/465] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 2b6dfb33e89f91d623a4bf5553bf4a8b8782d343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 461/465] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d0681491c502d8fcd2c671f526a68a81b7ac3b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 462/465] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 812b559cae9eec407a158e1649f5c2a19a084e7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 463/465] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b0d83714ad0..74958fa598b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.177
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 847ac259f924ca75d25c5df131044e95a1aa236d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 464/465] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6b37aa21b44..15338123238 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.19
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 13ee444eda747553272de7257411290f9292d644 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 465/465] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index ae1a202938c..16f328c45e5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.101
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-787547649

Comment:
Need to check if there is a sane way to get next rebuild without breaking it. it most likely broke with the sbcl 2.1.1 update

```
Next version 1.5.0
 <INFO> [00:35:06] next remote.lisp (initialize-instance :after remote-interface) -
  D-Bus addresses: (#<Unix socket address: @"/tmp/dbus-v2TVybHVHy">)
 <INFO> [00:35:06] next remote.lisp (initialize-instance :after remote-interface) -
  Bus connection name: :1.565
 <INFO> [00:35:06] next port.lisp (run-program port) -
  Current directory: /home/john/Projects/void-packages/
 <INFO> [00:35:06] next port.lisp (run-program port) -
  Platform port path: next-gtk-webkit
 <INFO> [00:35:06] next port.lisp (run-program port) -
  Platform port arguments: NIL
 <INFO> [00:35:06] next port.lisp (run-program port) -
  Platform port log file: /home/john/.local/share/next/next-gtk-webkit.log
<ERROR> [00:35:06] next start.lisp (start fun23) -
  In startup-function #<FUNCTION NEXT::DEFAULT-STARTUP>: The value
                                                           :EMACS
                                                         is not of type
                                                           LIST
                                                         when binding NEXT::SCHEME
```

Re: New package: openssl-1.1.1j

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-787708050

Comment:
Maybe did 911b71c break it? (Guessing here)

Re: New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-787776159

Comment:
> Maybe did [911b71c](https://github.com/void-linux/void-packages/commit/911b71c8c7f451eda4ea015ad5f523f7def43560) break it? (Guessing here)

Nope. It works with `sbcl-2.0.11`, it only breaks when compiled with `sbcl-2.1+`

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 584856 bytes --]

From 9f6186b278791e37a7bb962d6966d7b7660286b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/462] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 858957c29f7..ebefd43ae09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From b62d0d06bec1d1a19aae984e9d6ae5e8afe9250c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/462] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 8f2e75e2180867c7006bbe20b797a0dba24c0e5d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/462] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 794243bab93c456dc593a1af97a38a9c6178fc52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/462] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From f716d5a3bda4248423cf35d8ff1cf147e90f6bcf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/462] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ab85862d12ef712544ef15473ebd89fc8e61c3df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 006/462] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From de872050ff2fbc8daad37bd46cd0923bb89bf3e3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 007/462] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index ebefd43ae09..ad6ff42084e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 07cfefccec94e4faf8a61b43dea4feaa2c1f877d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 008/462] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index ad6ff42084e..cce4177aa4f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From d0df7ca5207cc1ab8c9272145efb777386adede3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 009/462] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..5daacf763f1 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 0f2716428baac79450d75788c725f4048bd056c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/462] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 09eb3a08745559279548d27b9d0aba3c64361af8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/462] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From fd507ca7221d97288320279dddb07658c657d146 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/462] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 5968e1884c4e18c67ca4b82242a74dfd8b2f86b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/462] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 92404cd75c3f69e7dee6bf4b51902ab1d504f9cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/462] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 7208e652580f70c211ce6cbf132240bb7c08557b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/462] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 87236c57cb1255f48625419755cb85688eaa7b70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/462] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From a81583f3743e00170a3b92f31e03486b0d6df211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/462] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From baacafdb4f8034f8020943c0ac1d27f87fa2b5ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/462] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 8c2f320299626b2e391f7b356dfaa268c24a3a0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/462] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d6e7d70f98762cd921ddbfa73e9c226555772003 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/462] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 8ebf22ec58c080c9ec1ae0cbd7d2caaf4df36c04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/462] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 38e3a8e7664b7fc24153a5e5f769b00422398a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/462] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From aa25368b6561048454aa1e9547b450777de068b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/462] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 3a447a41c44d13bfb9c2f6e2c44ed1f6339f960f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/462] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 4c225661652f3c08b07771429cd69ce4427694a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/462] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From d05e00a698a23a7ce501339f020d05dd9987d8fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/462] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From be9a8314ae91420c74e9afd212078f58f21ebd75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/462] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 95b4748120b4ec47699247a32d8e03def1ee4265 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/462] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 74ea86051af7a945022840258bed952014646a12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/462] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 64c290f6c4d67b7b553809764f40a602a52474f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/462] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From f1725b816a3beeddd3136c334295a531c84dc731 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/462] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 5e8a375d9e94da03191371c8bdb12dd45a10c8fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/462] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 079a2bfd7e0273dc8683bf34ed66ae13ef09301f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/462] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 411869a452f6d2cd83656221b524bc739ece6b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/462] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 4384270da4e5b21ec714f9c3d6a7a532a5c57e3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/462] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 1ce557335362c4c5adced4be805283c4a26c67cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/462] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 66ec993a3594e23ba1d5e6f930882784b3626d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/462] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 1c07e6574292090bf32af8832cbfda958748273e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/462] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 80cf4c1044c24bbdad9bece024a055db59ff61e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/462] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 40cbb84472fcfda335e4691ec9fddf3600428ddb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/462] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 6fc1be975854fd8a8bb52db82b8941cb53637396 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/462] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 7650137a56b0634841ea02117514fe177a8b1c9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/462] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 9b7623c925d5343bf3adb4de4f81adbec3acb436 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/462] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 28ab2fa605c732210d377102a1e58acb0bb0d43b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/462] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 8d718d45e0f4ff37de21543a0d60f792ac612e91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/462] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From c991384aba6b7f38508599dc9d17e687f9e7f84d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/462] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 163c751457c6cc6ceea6002b163feaa7f2c2e775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/462] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 12322571c1d351c3ac0c530277ff8070a355cc44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/462] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 2ae457504e338ba604a2f75312d28627340ba22d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/462] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 6e56dedc3d9f817364c30a1f70ae8b2e093afd35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/462] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From f9922d758623d23ee3ae26e2ce577df7b06012e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/462] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 9b1b7ffab7843e31e38dd1a4eda67c8387b85946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/462] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From f4aac28e85183d048eb046ddfb60b60f8ebe00e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/462] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 9f70ad1e9fea8d4f25faa59a48b43303b130fded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/462] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 2d2be06dbb6c9d5043caca9d2dcc2ad9d30d00bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/462] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From b7a4ed4964429cb7ca1078b4abe190d4bababaf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/462] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From f6a904148db275733afc827b722db1856f1711a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/462] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 130b38da1f93c3b711b343ecd149b0af3ca7df8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/462] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 2c0f08ec43911b6b357d671c3fb2350f564fdc4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/462] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 6a0690298040af9c2e5bd0d2e08fbeb90b05e619 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/462] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 1a37f95dbcbc3bee5548a33e7c736a8cf12cc9a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/462] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 323e542ecd7696eeb504a0fac1db4952407739e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/462] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 1ac9a5b5fe48463ca69d2b2ec4fbefc32a10def1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/462] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From c304467f0c8ea419f579f8266f88143f9952304f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/462] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 5831488cdd5b33fd973ddda0d0f1bb61d1bce718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/462] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From fadc71aeb4b9a169aa26ed6370b0d2fdc5273d25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/462] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From f2da718f16312252c45e3388a7dfdde222be4da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/462] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From decd71bbf45f7d2ee1f657c1523b5b28812597b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/462] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 941c9539bd8547a3a4aaba678ea7daac59a2c431 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/462] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 17d366047977b0b5f55231bae3295ab8fbff3425 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/462] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 919188d214db72a4907fa1d8131f457edbfee7c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/462] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 46137e578d3522c8d0dbbeec84bc95cfdf86d4cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/462] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 006173214bb3cbfed95e12a1bf2e0d9b809181db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/462] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 73827af2edfbcc49f816843ff5ef5be528ee7792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/462] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 2453ca0089fca10c7804ffae222a1e047e8b81d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/462] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 9d54c1bdecb5b1b004c468c4d1c4d777e2811fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/462] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From be79667c4b934c1257b080a6b725d6ad26b0c519 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/462] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From fcff86a868b9997f7570cea5fc3954414ee877df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/462] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 95f6782989fdc5221908603da078033b8151e7de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/462] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 04a1a2a9386db1177dfe5c28f8dd1360819ac591 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/462] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 9fd812b5242e3c1a394955117ec8d0baebed489b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/462] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 749437f6eb2af0c4b8a757d971752d9127be6660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/462] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From e709bcc96c8b952c02015f7966c543360875a763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/462] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From b38712156033da5f58d14538f4367daed50fdd7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/462] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 1f6172ebb61a1cbdb62ee4dca27fc1386220fcc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/462] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 96ee1375b9a438568fbb12197c495cf3e913047c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/462] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From b15080c6e7d58cc5159b57827692c9d9c43f65b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/462] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 93d0ca5dfd0d27f5e8c001a3256fefeb95a5c719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/462] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 5331121ab31096403138c8cec8d85090c6843bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/462] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f7ce0f7917fb52b69132c18d0fc3bc90ef431f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/462] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From b157656cc8c373072d645a529a775926eb158260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/462] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 47e23342b51d37fe0e8281f5244c723ae928ada2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/462] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From c253b89f306b7c2aaf4ee871c7d42cbc64eeb7be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/462] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5d97406dc16d53dbfce1f78e0288a3a6641449db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/462] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 9cd41fa0fb7a21781e1ca5b8ce5b629fae80c82e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/462] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1..22336a264fa 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 6d6ad064668c2d5705e21089858338b87579bfa7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/462] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From e915909b55e10add0e186dee9b892196765dde88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/462] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From fdabc3eb5aab2ad8cd45ce77b1e489a482c9d2a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/462] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 3397842d60930c88b04188657313d5c292b88125 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/462] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 35e9f567b8d871b8ed950fce1a673a30307b841d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/462] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c431bb0ace1a3aba4104eff10c98b97a7c6f3617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/462] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 7a6c2069f2fe5358ca836c14721c0d77f124aab9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/462] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 3dfd585028908cbabbd38df9c8d8dfb93dc6a2de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/462] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 0fcc895cf33f6cf0383c1e833bc621db319d6d4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/462] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 8524037d5d5591795ad8758e0709882fe570c3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/462] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9453484c815074efab750e299a5876ba6aa4add8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/462] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 3059156ea1c59beab4956dc4697ea77aff098ffa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/462] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 6ceea28b76e8616846a43b93f8076e4518a138e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/462] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 5622e654a8af7a2aa42f541fea65ad4f395e85dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/462] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From d713d62b3acc79e484069766819ca5a25d7ce5fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/462] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 224627cd0800e1d553d7ff259872f66e1fe292a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/462] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 1e05c39f857422a9f59565bdefb061e8592c7254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/462] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 4cea63c007c33dd234bb131bc165eb96856cfc2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/462] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 21f1ab1d1a2b4a9af8b786d403da0cd462c7922e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/462] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 789dd952841767b5f38a20d66931fdee8b344e8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/462] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From fc0db5ffe7664470d7c766af1253d16efc575e99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/462] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 1f3586fad0607e1d24d28647b4f3906c5176eac0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/462] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 26b47345995f9171ea9a36a7ce77f8a1fa2de1a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/462] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From a646ec04bf5767afb2ad71fe6e002cb89f614f16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/462] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 7b1d82591246f1b7ef3060e4d5c56d0acc9b0d1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/462] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 0fcb5790cf6bb60e98e7de43b4e2e986dc13a768 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/462] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 789cd2b1917e7fe09aadc85f9ac5a3a07e92a0d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/462] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c1f3a8fbe6c2a711466f2e73f701956e65b5a87d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/462] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 48af2e57267e91b2c3637279e26d221f7c1885dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/462] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From ded400240459e6f4862f747ef5420bcaa19e52c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/462] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From e50eae3da87058f1e8dda59c88c8eedaa9e443c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/462] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 29c808b496687795935cb26aad2c7c48ac426db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/462] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 84345ca8df3fcf6ff981c07f13f8333fe701db9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/462] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5cfa92815d2b61afd4b34bf18157973267610689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/462] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 8008280c2860cf9e9a53fce52c8c338261556699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/462] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac3eb941faa5f133f783f8eff6e8f97db91c152f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/462] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From e2e528d65fb25251eb874958c092a6cb67ebbb0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/462] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 7706c3f384d3d24fdf6f41975502c9efe6c3f590 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/462] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 4fc1688ebcc7d236852485c38e8cb4fbf5721258 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/462] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2145beeae265b7c9e6c43cb867a4356dfd955d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/462] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a663ae021a45fc1a27a83f819e94e1ec740e7826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/462] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From b059e7c6fc78cd8a1063660f8b8a9d336fde02f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/462] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 7a143d0f0d219302fca6bacf66d99a47291f4577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/462] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 95f0530a90afea5b359f12854a082c91f5b967bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/462] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From acb5e729cc6a361046065dcb6626a29d8b5166a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/462] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From f6956a6a17c139707e6e8d0f9860104781a525d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/462] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From c80fb9e51818ad436029a1353709d7642b7ae4a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/462] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 4da5500c8f713f7148fce95a9af0680b41896b77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/462] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e54d0472bb983a60fd974a059addb77a020fc8f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/462] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From ed0a8302694c4205ef265bcd64c2e507eec37d39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/462] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From bdae3a9cc543168ae4382f670beea7345944d1ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/462] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1f978e49a638857e37496c87a358db313830fa62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/462] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a9d020ec1e9082b7d780d7d9a0d629085649d01e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/462] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From ced1362c09c565508f02fc71fb17ae8ce12defda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/462] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 607fee639d17e84feda99263da393ca9b6288d13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/462] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 19ed714ed2616c77e2593761f08e7c23df6a30bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/462] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 39a58038b1ab330a2b23d61dcbd5cf2eeba33201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/462] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9780ecf2cfa84c92a64e077740eddcaa3f47f8ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/462] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 55c433b0975fd6aaad12d9b0bbb9e8d1b4980267 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/462] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From bf2aec282f5aac2ba354d7ab7b63e8de80b430e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/462] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 066b464c852771e29ba3ad027652193e7316708f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/462] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fbc46f243309e586d9c1d977b769798540980a7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/462] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 650222769b18682c71a6939f7d6bf145aaa732f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/462] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9ad4bf417a6bcd025c54d96c5d140c3f295ecf95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/462] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From e8a9c828c49b9d225865f7fc3c7a66ef8dcbd2c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 160/462] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3d8962305fe971d797490ad279372d09262468b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 161/462] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 8e436293abc031ff51d7f843ab5667f2420c6ed3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 162/462] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 2d01a2bf023c3992512e74a9d2da31d83fe4f912 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 163/462] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 38bccd7128259ea54ef2448ef385f17a7507ef02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 164/462] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From d1518f93bff2635de2c5034c157e7b78fb173c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 165/462] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 4e874398b0eb98f1950fc5213ada95db5a2873af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 166/462] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From e9f0b15dad118406d113738dd16314022e7bd0fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 167/462] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From d86015b52706ce33299d6a3bc2ecec03fd617fd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 168/462] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From b23e9511e3cc9a1afca623223bbc2457296e4f20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 169/462] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 0453e86f576a0c9eb2d71443041bb8074624f768 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 170/462] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 39ee34ff8ae046bf6b00997fa4f1ae6d0e638f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 171/462] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 88b8d22ab86b4204bc517408915354b2ae1c0762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 172/462] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 54d6fe4764e13f3697853ab08a8860b72954e74a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 173/462] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 27300b69c5f02d378a515d984f64116c77987e1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 174/462] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 80c35ba0e870b7a7a358b59882b08f275f4c6be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 175/462] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 4565d168875addcba6966dad83b15a50662a0f75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 176/462] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 299700c4052cef3bf3094c52449c4b6cb1103a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 177/462] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 9ae860eef9d8c82161a1c50d14c64992a1c6a5d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 178/462] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From ff0024cfe0374ca6e429f7f9f3aa75742a90f8ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 179/462] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From dd05afb2b92914feae5a56b270dd0b4c3175b4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 180/462] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6bc2aff4998866598aac7d6e0f3407805c3fdde7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 181/462] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 989d9c70daa0e5626569185a833604ec06c77f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 182/462] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 0a19dcea347b3ca4f89b8ef14372cbe07d01e041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 183/462] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From f4918ebecb1b35e2d76cb4fe5b049572673322b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 184/462] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 4373ee182406b341e10879068adb1a5220e25a55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 185/462] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 35c3a8ec0a17ce4deb83c76acb7274ea8076ff44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 186/462] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 33b19e559122fae4a1f4ac98f54414455fddc7c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 187/462] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 970e4e347e437be7cc71038347a7f800bde9813c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 188/462] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 6470955f828d055bae7b4a636816bf2801cb256a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 189/462] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 5d833a1ac7ca724674e16b89523a000b166a9a59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 190/462] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 2412e763f5362e7fb1a0641f46d4cf8b03375db2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 191/462] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From df65e2e0d10143fcb3b58e36413f8693e8a2b644 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 192/462] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 3b4afab5b9a6e04c882091370dc198277b0402a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 193/462] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 217b45ff3c80a457c7d7ae530a7559aac5eda115 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 194/462] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 51ef86d9f2231c2864bb6f24db68aa2109f7a5ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 195/462] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From a97d2d4e66d90c6ba4c0601b3d1c5399f5ac87dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 196/462] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From d18ad2b2404c02ecf11dca68f3681cfa8005e153 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 197/462] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 6450932ebd3046c7ea3551b18a7c3987d709eae3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 198/462] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 46fa4d65af229c7f24219f955dc4f4327a81d239 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 199/462] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 443e71b10298c3886d8a3e7b7648072696ee03f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 200/462] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9b78c314d018d1920311e5af1de9bc8fc2fc558b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 201/462] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 441b9808b122c576099bdb6e1a18dac0c584c9d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 202/462] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 1486a351cb7ccffac15f8eaaa8ad39acd28702a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 203/462] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From c8d724c001abc8c390ad5c3efe857a2ff279b731 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 204/462] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From a08eeb6be8d91d975d39af9b1efe0cd9ac73ca85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 205/462] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 5dd1de4b097d9570e62d5a0b8120f1bdfac4ea60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 206/462] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 01d41385d2275c0e0f6285e47a93f42af31b9b0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 207/462] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 1c8b5193e5150118cd6141639ee4fce5cbbb35e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 208/462] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 6f21e4a888fd3b750c4ae6969b90feceea9811ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 209/462] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From eeaf8aba99eaa090f8a125ba0b62eb6ec5ef69de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 210/462] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 8b5205ebed100ed80b9bdf239554cac88433f5d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 211/462] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 1a57b2562b993f9df9270114f890306f47ff3271 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 212/462] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From a182245dee62d2b93e4f8acf6536016d1893d7f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 213/462] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 6bb236c9ab6ba0fbaee1d0682ff9be04cad8b99b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 214/462] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 355e0d9b55c19b6b5b25257415a171e5b7c65242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 215/462] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 48a5b52113e821c2de4b760f759bb301e1520b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 216/462] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 0839467abc0835c1bb5ca35371f39f99145b817d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 217/462] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 797761750ddbd29d7c021d0d2cf1e87b9c94cd0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 218/462] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 1fa9e9ae9e04a398873a267cb6f395db315a8596 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 219/462] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 42ab0ff130dfc9a60e51530e7ec967e2f5db682b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 220/462] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 25fdfc492715ab9ed79e237c8f5bd9db353f9593 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 221/462] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From dee1f6182982f9530556d970285c8aa05a03109c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 222/462] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 817bb6135e63e2c9a505cfb242ab3c1606cb7687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 223/462] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 7ffa6a5f37c9f1024642ed2055d495d5fc86eced Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 224/462] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b41360cd148444c968361319495a13ff67d6ed64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 225/462] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 256c304ae973d1352a747f7fbf2ae49b97a32d7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 226/462] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9e914352bdb4be55a7bfba0972a0531118a0ce05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 227/462] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From c621bcd8c1f13f3c4e2e758b1142a707e95bfb82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 228/462] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From a935c7f59d1028e8cd8879cf1fb89921dc033bb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 229/462] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 1254bd7a8395f6612bc6a5e0e20e3866d24893a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 230/462] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 9e59c4bbf933dec052b12175b67fa92f58678294 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 231/462] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 84fe5771231b49e88bea10f76a20dbbabcb0a42c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 232/462] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From a689515865a3acaf61c459e9a07500e8b7037e0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 233/462] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 4c683b374392150c0953c6c44b78bc46632c887c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 234/462] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 65f6af0d698b7bf998dd579aa3699be34e82ba7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 235/462] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From dd8b073e45e1c21486a64c3429f0290e97226d8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 236/462] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From bf8f03d058f23899eda61beb7d1aceba161c5341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 237/462] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 2deaa375651ed98daf65872e4ea981b53f7162db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 238/462] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 4a4e7b90228f82ecac627edba762bbe15f10aabf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 239/462] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 195d7aa20c0d4ba6c01d08986962682886daa604 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 240/462] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 6e280a9382ad91e5838ead197f5d9f88069c630b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 241/462] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 9ebf41c9e7cd869a8cd076e8751528ee6f31d810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 242/462] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 08a9259dea8b2956b73ddc1b14da2b8a6adfd897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 243/462] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From aebeb1b35f5b0283533803014ed32466698529b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 244/462] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 4f72a0e84d523b6484da7cfd3513cd2aab2be4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 245/462] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 79e068cbc83734c77f1641723a19327e4c4c77af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 246/462] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 35b7fbf344557aef0ede89e77f3887e6db257b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 247/462] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From e0a14cf9cb77638f45fde720227c3f2ff3a75d24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 248/462] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c4f362c36c40704012a8b5545bca9b4bf2eaa771 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 249/462] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 2175c3baf91f9da53722a15fe72139cb2344ce3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 250/462] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From d3a5fdb3877db830c0b677b672402813e71a34aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 251/462] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From b827729465d05d24372a991ebfd91e0dbc3a1fc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 252/462] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From f2fba81677fde04fdc79e497b8bfcb9dfed32ab4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 253/462] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From b58255d06c70668c5c24fc8ab2aeb0e445c56b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 254/462] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From bf6a4a368401f4139661d077dde91fbae5e70d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 255/462] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From c85053f93a66b5d694642c174d6cfacd1ac99c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 256/462] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From f71cd527cc91437449a6989c8bdc8de289f47a1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 257/462] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From fa9313eabfa88f0cb1bcac2fda9a9a08edb90152 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 258/462] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From bc0fedbbe9120597a9ebd19de6e7fba57fa8e313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 259/462] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From c6df5f9fdd6873757f9b3634018f324fe1f17c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 260/462] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 8049dc79a6fc67d2ce059689226e7435ffb94224 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 261/462] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From b96ce58013085e2237f933e82b66626dcda7334c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 262/462] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From cae40da8e3ca4f08a900397cbb229cbaafb5115a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 263/462] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From f5778e959d1dda210d3888db33b5a34e3e27083d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 264/462] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 1124508e297c617c0d740f76c80f0e32891d8fc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 265/462] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 34339a83b92f49d63972684a4cf139e0d5503b3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 266/462] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 4dddd00f09b51d52d665259dcdd1bb78b747a52f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 267/462] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 48d4f827d04bd25dd7acc88e4e215083e08ace4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 268/462] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 0171b87021172b8a769d11c2ed18348386f60f33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 269/462] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 1673fceebb593ae8e659796823571480383a61cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 270/462] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 7e2d3f83abd998fb3edfeedff8e3fca643bb0799 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 271/462] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 84066a106e61afd4ba6a9ac04e87dcbb03b88070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 272/462] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a3cfa3a8e710970b4b44643dfc2c45d031af5b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 273/462] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 11b1e78d7d4b5d49538fac01daf7052ef73073d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 274/462] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 29444da28b1355fabffe95db65aea9fb07406dcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 275/462] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 640672fcfe2bf10deb3c8dda6822f587ddf1ae5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 276/462] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From d3e056f4c77acbc6735bf205e8911bf44ae561ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 277/462] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 2bff98755e52da06027b4c6f9a2eb12b4e2fea53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 278/462] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 24a46524bee2c48b6a6cc5b9afa5fb2ca71f641d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 279/462] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 639304cf1cb54c96e063a369afe604c3baa6bf06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 280/462] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 9796d2c75cd5e8bc84c0db8e55c2665c6714ad68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 281/462] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From a3311a117701e5b9b12de283ddc4feb94e2a20b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 282/462] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 0ce9ded85895f25e9dddb0024474bdb4d43bf587 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 283/462] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From dbb788e5a63b51be8874fd70db947fccefc732ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 284/462] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From b2f4efc44ab7918077f626e2e7bda7b97e338a14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 285/462] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 8df95a796a84a4e266813ec77f5a7cd4cafd3de6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 286/462] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 98f3d113e7a0c05fb51bd89dcab50aa22f3d3acc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 287/462] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From a4de41b19a6c28aa43ab79f268bc82eebfe4f062 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 288/462] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 66824d2592d9231713e39fd9b5db54184237c188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 289/462] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 98188b8eb4c6e7f2959419afe5b2477215320cfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 290/462] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 5c35144ec1ed703b55cc49d9998f88158893f468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 291/462] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From e09f5ef2ac6da29de401fdf15443c6bfb9146542 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 292/462] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From a6c7a45b9299b21d2b754d5d564c871575ba899b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 293/462] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fc5a057e1746066aca329fd46014418765a341df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 294/462] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 216d8a3b1d2919500b8918627112d6bfb822edf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 295/462] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 540780d5cfefd07f3432ead3fcd49487c987f60e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 296/462] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 87bfa1eab89c34ed53d21c907b33d991545adb15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 297/462] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From f7ec1364e2d7e88dbe4c9b095638af9b5cc8ad9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 298/462] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From edf940836e93b96e56a9adf77fd021f62861adbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 299/462] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 9f364d66e78109de93cb33dcfa893c5a1d2ab95c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 300/462] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From d31dc463ccc654b395b324e542231c41c75df78c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 301/462] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 99099bb921ece9d67a1b07f5d2748c0f100a76b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 302/462] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5946f357d48147ca59df7ed136f84adfbe5f3df6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 303/462] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From b055fc3eca0fb9310801e3c4a4a01d975a020cd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 304/462] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 463d303495c1fa8648ed2afb85d1416e9b002520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 305/462] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 02ab44423dff5f6936392ca7e6b9c268b9fdc0ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 306/462] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 391cdc1badd3f236413744f4a9bb26b686c9204c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 307/462] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b99f8b311fe502721d0f5de74eb07562298e0b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 308/462] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From b4a9171040b86a70392577cae78c92d0f7cba82b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 309/462] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6021f0e756a50d4688a9b928ca7ffa49eb38f59c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 310/462] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 185a00cb0776e68a35e241cb9e9931551374200d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 311/462] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From a36a7b476ff74f6fcf9bbab4df8bcc447479e57a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 312/462] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 2f0fc22135e319efec31e1b9907a85df24f5bf79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 313/462] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From ca8479c9156330d1b83c0834c5b3c3cf59a918bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 314/462] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 79d5345577e826b8518dae6e8dcc59567d9c3846 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 315/462] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 6e9446cc5a95fdc2d881800ff3ea9185eb53d90a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 316/462] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 7ef132ea47453e98c5d99fd7406852d4d268467f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 317/462] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From fdfa55e4dda981584b5cec7d4ef008b024ef7566 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 318/462] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From defaea34692c1a38abf30ec264ef7ab6d6644c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 319/462] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From fc2d6fb18f61e220429194ac1f3fbdc70ef95a48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 320/462] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 608255e0c6aba086b958e6da2b60970089abe6cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 321/462] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 884c6007b9e860593cbbd1b805a661cdf1e27f4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 322/462] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 90c714d04d1ca89f7c93f34dbb858edc698c7d33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 323/462] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 8546882ec70081880073deed903ba318c888b754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 324/462] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From a1f66b912991268c62edca84e6db52cd8db8977c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 325/462] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 7d1c5589d94c7851ed4ac4bf12495bbc08ee43dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 326/462] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 6b7b9083cc3358d4ea966d7b29202d64eaa4d23c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 327/462] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 7779149340ed55e894b6dc4dc2f264f2e169bd78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 328/462] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 5d23339df71c81f3ab2742bc715abe44f2e7dd8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 329/462] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From a7d680c777ada74e8da40c71de574287d844c372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 330/462] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 4205303189884b118fb6cfa78d94720863af7ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 331/462] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From d8306f1094f7fec99f1153c508399c7f2e0e0f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 332/462] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From e9847efe449844731776910cdb24b8fdcc023ea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 333/462] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 87752ebfefddacfc784db18d754f5cac12c28db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 334/462] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From b0e4dd4596d968c1cebef770d279f3b6a7197ec6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 335/462] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From fd06754ba40cb00d845f7748a48856bdfa756fc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 336/462] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From ce49b9017b0389f8068759439b63821dba0fa015 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 337/462] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 8e34cc2d15da3676bb167b4ecc3a3c78ecb5950d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 338/462] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c038fbced34b128bb3ef503cd06c23f7d59374e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 339/462] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 0a6cc2ec8cd892921780ff1eb49824235be52feb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 340/462] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From e34b070a2019ff57214556eae0179fb811020ae0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 341/462] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 2c9e5dfcae0030c4867e3b711af6f3cdc6d5eb41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 342/462] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 47401e253d7c1cfc99abb321aa2e143144f144e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 343/462] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 86f6aac64d9c3d1139cd8a853f907614a5d4a64f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 344/462] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 619b8be541a0f5535033fc80f40a6011a6cc6bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 345/462] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 68adc4565676584b52633b60d2325f50e3e7803c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 346/462] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 1d5dfb2528e167898ae0f860980f182269eefab4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 347/462] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 684cd1e9d3ff509540a0b3662edfbcffe20399ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 348/462] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 39c9f67a235f3d61883c6c38c606b2b056f56cf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 349/462] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From f00bc62c408d96556a488441c2887d996cbcb2cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 350/462] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From e6423b950ccd13b5565cc7a9c0c2e4e8ce7ce82d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 351/462] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 73353276806242bb7ca408dbe0131ce0019628cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 352/462] amp: rebuild against OpenSSL

---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 22ef92640d2af6adbcdbf0f855c92368a4f31bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 353/462] android-tools: rebuild against OpenSSL

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..5e28c0e2f55 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 863a8a0e949ef308df1ef9d9bbf998a1ad011636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 354/462] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 617669614d029b575820a473454143b120dc56ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 355/462] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
 version=2007f
 revision=3
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 784bc9dac753a40bacee05f29f938cfd82601367 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 356/462] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 132b91662c4cfa5bb5ff8593d0c91f96cad190e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 357/462] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From b0768049889e4603499e28bd39e701d06ef95c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 358/462] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
 pkgname=choosenim
 version=0.7.4
 revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 3a05013ac82e077b70d25be9ddb3c1388121f5cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 359/462] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 08ae317382ef0a1428f8e0e72c5ba4a5d62057ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 360/462] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From f09c97a49eb95ba836bfaa3bfb84554f6edf894a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 361/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From eccd9a7b4ab75ddaa010b00afd56d0aa4018cbd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 362/462] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 45a36feb35a9e56b4b22fb321e1fa7d86b52fee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 363/462] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 3118832ff2b9547e23f4464a730bf12e17a638e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 364/462] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 8d0e6c3f82d34b4418e339bf9f1e9abec992cb8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 365/462] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
 version=3.0.8
 revision=1
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From eae1340b288ab3c03ff8370a3dc91d60779caa88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 366/462] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a9fe29d5904eea5c898705f792328fefa77f5ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 367/462] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 8d664ea7d29a53a9c6dfa26908132e389e4c249f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 368/462] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From d273d9d4eb788169723ac1706609513c78864cb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 369/462] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From fdea469bac674b0b41d7287d1dd32750eca9317c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 370/462] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
 version=6.1.1
 revision=1
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 467f90fbfb6055ef3e7c871ffe1f24c11936d211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 371/462] ifuse: rebuild against OpenSSL

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d10fadc1e2f152ad67d99d6eae42921fc875e63f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 372/462] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ff1043507d7ddd101e0e32afeabcf38a61119a2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 373/462] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From b8c18b9443615903035044e6c0a88f1379e65a1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 374/462] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From d63533ff1fa7cdb78175e161d4e122520a6801dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 375/462] libasr: rebuild against OpenSSL

---
 srcpkgs/libasr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From b29f5e47f3900f820c9dbb8c0d1a9dc184c5185d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 376/462] libbsd: rebuild against OpenSSL

---
 srcpkgs/libbsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 447c9ff8f28ba36ed4b1f764bb30b37a5a249106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/462] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
 version=1.2.18
 revision=1
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 42cd155ebcb350bf6f99984c494a1a13930c866b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 378/462] librepcb: rebuild against OpenSSL

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3677aebb172ccb4a50d438973334d0a989ad58bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/462] libsignal-protocol-c: rebuild against OpenSSL

---
 srcpkgs/libsignal-protocol-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"

From 1ca9680dd02b938809262ed9d952521e6cc708ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/462] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 11e330c7d363481f7ac20fbeb39466ef4bc1164d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/462] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 27a13c091f8ff586afa2dcce7c7cbea995475fea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/462] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 9836fb51bd15cb70be24d6810c135fce95a37f93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/462] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
 revision=2
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From e34f837b0bdd8ab6246d5dd88d259a3354f66c37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/462] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 25fd6cd568cb66ed3916b3a2174bc751e0fe5d89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/462] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 029b86418f097d84936f4c4e908910db761fb9b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/462] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 076ef703a89d47fad6f7f4515da9d699f3a78ba7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/462] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From d357ad95e5fd8672be4b4e28a1c91af8e38efe14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/462] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From c3423699e6c48d7760c6663f9cad7f8498068329 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/462] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From a70ffcf6d0f21473439fa1ebebe435adfd42e46c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/462] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 0e76d1486812520c2149259545c532dfa9b73094 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/462] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 711e2a588c1c01c80abc109fd96240dd6b3980c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/462] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 15441d04b99a92f00a513be805b90cdef1f97929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/462] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From d872a958461647c1a37de29819622e82578788a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/462] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 2ad815d16f3d813bdd2a9957c8a9c61050f4187c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/462] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From dd7f3a5ec5bdada6376ca18343683507d43ab1b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/462] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From e549a0affadf0a9e261ad177f0a510defb686009 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/462] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a6457075e789e722bf5b41e5fe3aecbbd24e778f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/462] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d9c449dd50092769c8e0cc98c905f6838733b3a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/462] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 347c5b895dc86e96af0da493fa4ec3b6c9ff811a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/462] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 715def3d15b5785afb523a261fe0df96c0d317dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/462] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd..3878ffbb19c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From e3ae138805ce5459e2f1a1cabdf46c8aa0fffe7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/462] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 076ed10878b48b2aafde0fce90c7c14d635cf9c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/462] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 850e7de68e92cc7c631fcc53775bbee5138ef14e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 404/462] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From ae3cdb5f808a5d6c251acd7d7864cddfb30c920c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 405/462] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 1212ef17cb87425fccbae42a5c2845e82de637e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 406/462] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 8d74e6947815d4113cdcb782911c350d9bd9ad8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 407/462] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 48f30a0c83986074d53ce88cd70afb6efbbc6483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 408/462] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From f8f61e5d923584e37d23ba2062d1bd36156f6d03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 409/462] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 8c085ed82825fa9090d00218e43f569d036c1676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 410/462] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 66cf2a1b52de5f3312b1c6f873c5eddf8c682c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 411/462] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0939e8d17a32e6e5689ede158be16a034e5042b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 412/462] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 6386fe048b5a9ca38714a1f24dbef7cac81657d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 413/462] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 61440ad603792810825db1de1f79c1a0f58c1a3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 414/462] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 37ca0cff08d2e5a4c6cc92d029a98033c9f0f854 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 415/462] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 730bcf0e17f4ba1792800dd212134f5eaf0a15ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 416/462] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From ecf0c4f0ddeb4c4c36458ca3f0ca445bf3983f6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 417/462] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 8a0f3802a548e0ca4c0328ec3b37a401ac84f49b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 418/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 8b465e8f6fd4c3710cc1b51dd00d00e3ae563ba5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 419/462] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 806f48264cd0406e4b5d8a441252b3a16936d36c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 420/462] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 63c5229588d0f175591c43fba076390d475bd557 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/462] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From a3b9360755354083f4f5355f2342127c7e41163e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 422/462] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 23a2e05aafdc826b71bacb7f798038639f7f944e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/462] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From a3aa70ce5a42c085832ea8662b16818f005b04de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 424/462] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 864a261f414305edf566849a33805290b1259560 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/462] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 0f75d300b4243e5b77c15a7f2dbe0c38bf5ed955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 426/462] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 2e68e077b562587bc430af6fb3f650bb72cb84d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/462] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 854985a07461d996c8e66481972bfb4e63373a8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/462] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 298a6b019f948d20d66209d2da7c67749793fdfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/462] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 18a93e47cd7178e34a87cd4034e7b122ac86a65c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 430/462] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 7899b012ca740b38bccfe8cb387646c78112ae69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/462] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 9a0aee38f95483487be180fb65ed7cb6194eaf86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 432/462] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 93490d162aba3bc3386e1dcd64ad3a364a42bb08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/462] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 7efc8999fa2fb8f5a73871ca7f06a2ce76e49c2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/462] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 0a917e3d4c185ea177e98b8b5a1756a37e5cf53f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 435/462] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From f2d3f8636b513e1095ffec59fe9100c226e328ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/462] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From d992040f47fb74f657ab928090b6639d3582b034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/462] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From bd020b95607f073ab16f85d519955ffbb71a8f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/462] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From ba8b06171af77c80f952a68bdbc6aa5bf149e348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 439/462] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From d41e85334928897390dcf866027d11dd2dc6f7a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 440/462] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 3cf55e18bf5ad38f1400e20b73e9765becc26e1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/462] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 1bdb308d799624b9275c9bdf0973d31116ab62d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 442/462] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From ec4da04e1f3d6376b046f990dddf911986c730a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 443/462] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 170a2398cfbdfd70b55159b6d2822158fa0ffc22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 444/462] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 74b10d8c1c24634b54f463d26cf5e9341330517b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 445/462] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 6c5d6b15530b88976d1020dbfbffaaaac069eb61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 446/462] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..c1c5b5c9b44 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 7114c2f8447463eb3fd0326d5e8016822c5d5449 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 447/462] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 200c2d6f0d49a3b8024b6cc898d48e91a3f0c543 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 448/462] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 4321fde7045ed5d9161133e9a1d614e6d19596d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 449/462] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From e4d0735203c2c0b24ad91eadd3b1d6dcd8c82fc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 450/462] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..235917ab151 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From ddd531228aa18cbd0002938f57771e8da4506014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 451/462] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From 8c4c8ac2577ba2dfe307cbf85d53f6a6903dde89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 452/462] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 3baad3955c163f9d2ed6a8680f161f7a20191e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 453/462] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 00c0dcf81c810272053d059485634c1a80d2eb4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 454/462] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f9b040484cdf44a41dff45b7e57dfbab591d7c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 455/462] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 0ab4f4b1c8975bbcb8a8d1e840bb3c284a6e1344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 456/462] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 656fd7270caa3f7b74afde805f3af3f5877d64da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/462] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..295cbb819fd 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 7aa3c1973685acc6814ce5f4629ff86b7d705444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/462] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b0d83714ad0..74958fa598b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.177
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a031c06b6ad0d4da9e051f1d74f510f6c51b2eda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 459/462] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6b37aa21b44..15338123238 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.19
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 3dbd42625201da3f585b8a197f7787d18d5deba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 460/462] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index ae1a202938c..16f328c45e5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.101
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c64e5673801caa19b2dc6a790f4888ae5785515c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 461/462] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e4..0ff0fdd4706 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From f7f765cfd8a0d3379020ef6b819719b44dca4ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 09:10:55 +0100
Subject: [PATCH 462/462] sbcl: revert to 2.0.11

This reverts commit e1632b85621c1cd6128a8e659ef2e4a148dbff5e.
---
 srcpkgs/sbcl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0a1afbeb9a2..1dd77bdc969 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,7 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.1
+reverts="2.1.1_1 2.1.0_1"
+version=2.0.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +13,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=a9ad892ea038b7155a60c1144801084fab3b2b8cbb0c5bde7e1f42a6b4318a97
+checksum=87d2aa53cef092119a1c8b2f3de48d209375a674c3b60e08596838013bd7971d
 nocross=yes
 nopie=yes
 
@@ -20,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d7935c116af2ecd7485eae54d29491964b1f3ed97068f3127bd8871e120611a4"
+	checksum+=" b7e61bc6b8d238f8878e660bc0635e99c2ea1255bfd6153d702fe9a00f8138fd"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 586717 bytes --]

From 0772fa5c6bfe28563e1f900d9f9786cd10654d2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 10:40:53 +0100
Subject: [PATCH 001/462] librepcb: cleanup makedepends

---
 srcpkgs/librepcb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785b..68f1ba250f86 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel qt5-svg-devel zlib-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 935f6372fe6f199f1e6e46c930e927cb480d0343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 002/462] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec380235..19098cb84aaf 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From a59ec47cf54164b98f9e9fc08a9b87ab49ca0fea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 003/462] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c3..fdd5986a740b 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 98227a4aa453738c79b8899fa1271438f61b5dcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 004/462] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297b..95c48dbe8cd1 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8792e7ce6eb9fdddf67dd9d4b6e8a6155896ed5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 005/462] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf1..f62a206c1fd5 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ae8b97364d29e4b72e5f80364e890eb74ad82521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 006/462] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d774079..b394a98c10bc 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From d54a447cb8feb173ac68c6e147d8fe3dee3c4254 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 007/462] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index 858957c29f75..ebefd43ae097 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb519..fc098467c593 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d2..731168709b80 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 000000000000..fc098467c593
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 000000000000..9df423ed7a21
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 000000000000..db8d04f9549e
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 000000000000..a5d5038a8320
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 965095312dcd098a9ed4f0126cc4df05ed8acf34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 008/462] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc541..6ddf5e3bb620 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From b59c3d186f3eebdae83b5b567cf80c677e977f07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 009/462] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df6..ac855d9474ba 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 956c0438d604cc4feef184b8d783718aa987e356 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 010/462] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a178..4e33113d349b 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From d8286a33949e843cd1642db831074c96c8e994cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 011/462] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac6..b7e7db5c41f3 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3e0a4a359b1af7fe84a4b9cbf8d9c9c769cb85cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 012/462] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a34..963cbaa3e9d3 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From b636702512a1728470bd95715e4a10808ce3884b Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 013/462] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index ebefd43ae097..ad6ff42084e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 000000000000..b1e1d627c8a5
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 000000000000..bbb4a6f464f9
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 000000000000..eb9ca1efba18
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 6008c453cb02260550f34e3195eb388deaa31c10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 014/462] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index ad6ff42084e9..cce4177aa4f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a21..000000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b80..000000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a8320..000000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 107e4a8a62b250376ea67e0ba2e4f819ac4b2717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 015/462] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0f..854e76a613cd 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From bb1e36f2ee1b99220e9497281d314dec88d3d520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 016/462] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed1..9aacb4ecc354 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From cced4af46b9886b2d56fb3d1fe58f656325e657d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/462] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e9..a17a764df38d 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 451d4ae1caf43803d065ff1033940692390f5bba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/462] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b2920645..e9cbeb70f5db 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 16534acfd74e1e1d2cac47c8fc4b53037b9d90a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 019/462] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d2673..51e24d1465ee 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From b87eb7bbb325ef08d65c797522dc7a83c61ce10c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 020/462] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa555..b8ea8849863e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 6983c09d90a5226e34f2b67ae148ca2228506103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/462] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af371..bf25920d2cb7 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 2c4e41ae035e86386db3070b034f5eb436e5aec1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/462] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e5..604bcefb5a34 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 1fb2898298509fa46d51a6a5fecc0518295ae827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 023/462] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb9..8721a772a330 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 121ab9f16cb6a2e46350636a5c89a57befaf3c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 024/462] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbed..13a20ee4b7ab 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From a80446343985356816bcbf89b79f8e7d0035f53a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/462] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90d..54d12f3a57b5 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7cd7af802465c8a2b91a0d623b5a3ca8aa1d222f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 026/462] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326d..26bcb662e9fb 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 06950b5095b2d60e258e7c14748e50b7138dce1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 027/462] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e45..21336257c6c9 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 69fed890f26059dbdf3ad416de69a4c8eb1a0655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/462] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b475..5fb8294254f7 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 778641fa6dce3abf284c3d5e9454a270c4187ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/462] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e9588..bacfa29e25e7 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From f831781d5183822a432e6d8ea50944ea2b0fb67c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/462] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 000000000000..c289a1dc267c
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b3593..153c0341edcb 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0484a2ab655844749bc2c38bab2afbbcc1c10a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 031/462] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782af..9fbfb8237b69 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 27e69c559c3aee56456e7bd066b41c48ef43220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 032/462] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda31..9a787a247770 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 2391c08b506cf50dfd35a1204d1e69d2686987f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/462] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a91402..3b35580d8b34 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From c14dc01ff187b0a6c4a9e9130085370d252eeffd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/462] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc4..7b8adf6f4e08 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 54bf4155a12d3f922721aea3c88dfc8aa7c4df04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/462] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab57..f36a9914585c 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From e28b6248ad47f48a1aa2a6db32c831461dd23739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 036/462] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98c..9ec3bc2241a7 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 444d5243d2714d9cdf8b5fd0af0f184171eff6b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 037/462] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 000000000000..f062675dc67e
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d45..f4746e263f89 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 0e6abed831eb27363e5500cd9d1bbaacdfe8535d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/462] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632ae..3506a68aaeb2 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From c0e0fcca7cc81510b6e128d821498d0f9083d8e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/462] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adbc..ee605e767102 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From eb6d1e7dbf8bbdf9225fae52d9fdf764db99eedd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 040/462] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d790556..157b87f7486e 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 90c04be71f7e1e8485bf345e58adfcfd53d3be11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 041/462] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab87..ee196bbe4eec 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From e824a852611caac539a33635da8cce0ff9f8f9b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/462] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e6..237555ce0e59 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 166a159e7205dccbebb9daf17f52a94e5f1cd120 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 043/462] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa5..8777ef98880f 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From acd8016e7b90dce1204cdfb568da5875be5237da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 044/462] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c2..9c9781d1fc47 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From c9393b110b1ff2089c102182ba72c95266293b94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/462] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee80..023401daa9e0 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From fb87cdfb655b9f79239ae4e865ef36208ec17e0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/462] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd3..cd177eac2907 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From cd332394f5b7b937f41eaa111063fce794cc0c0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/462] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64f..56fbd4eba258 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From dcd7cbeaebff034bf4f9c53e72f0abc4bbdf2099 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 048/462] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c72..90e5b108429a 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 87ec43e6654a5e9ac49e6675d8e2ee4fadffc231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 049/462] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff52..24a3e3a35e55 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a69988be5cd9143292280d6c918256bc73222d51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/462] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5ac..5105eb05af5f 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From c8d69a78bd7c9bd7cfa94b0e8e042ff6568fca1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/462] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a4353..6c6c5b1dc8e2 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 1e1ce0be18cb5e687bf93835b6c34906bd2345af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 052/462] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d5436..c4b45f44f2e6 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 7d2a81e62f7b91ef880f0180a2c66019e97356db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 053/462] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad1462..7aec8859d726 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From c7298300d9d2c495d77ed3403a0efd618df8197c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/462] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba8598..3a354656e3cb 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From ca092b5e646c9610726fa63795f5ea17428d3827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 055/462] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee16..6361f832d745 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From e1f297658bcfeaa7aee3cf82f29b489100c614e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 056/462] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee6072..2bcf90c8457b 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From ddf0b245ff6a55ddcc49dd42b78ea1421416a7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/462] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f9..fe20b20de328 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 105f83b807139e3a56030fac7e9e92d0dde0d096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/462] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1b..077ef7a3600a 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 08f47c2339d1a15b115349907b572db223ac8120 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/462] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c409..a852d5ce618b 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 1fd26625dacf012503045271cca7bffddcb24a1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 060/462] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c7345..48a5fa405969 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From b7a68e6efb811e8718d3ec0d56b7ebbeb4d93a81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 061/462] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f2..585ac7a0e94a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 1413b8736bdbce62c74004a104edeecf442b017d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/462] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 000000000000..1ab52f8f5bf7
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 000000000000..40f7066dffad
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 000000000000..702ade447f9c
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c84..d2bdc4bf77e8 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From c2a2e39799548d4009f494a3d71666a50374171b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/462] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bcc..71892496013f 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 9dfb88513d3be535a68ccc6fce0fa1399298ec92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/462] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 000000000000..c5769dfc12f9
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428b..a14781b0c3b1 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From ae5a0d8fc16636f8c5447f53ddc2469a18f9a9b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 065/462] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f25467..84819fd693b1 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 03376bd93156456f16c7e0aff538dd0bc6eb476e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 066/462] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 698676095074..9a2ca615b25e 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 57e92180aaaeb940b3f35de043705758df967e84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/462] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 000000000000..5c3e419a91d1
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00fd..3d25252fffe5 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From b0b6257e6ddda87bf5b8de864775f83d3fae0820 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/462] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053f..83dc738ccbee 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 2302e2f015c999b32acc69abda8871587621a3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/462] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bbc..16918622db96 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From b78e4b7a43995263975c8e0346ad4e354ba5c029 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 070/462] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e4298..7790a5d6dafe 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From feb4e420805e3ab7538a3364763c26ae5514dcc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 071/462] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b9..0734bdb13018 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 67bb18242f1db7bd2df57d50c29a2bc3e43e0851 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/462] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465a..618fa29772dc 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 04935901fb38e7775c822dc6de89141be00a9f8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/462] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc4..be10fd98a2ea 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From bc66abdb081284e49613633d65469de37e259a08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/462] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8e..ec37f315d050 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f61e2ca0f395a1236cf9270e48be17d765999276 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 075/462] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a81619928..b22afbbe9b1a 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From ab000091236a6d1a6bf0ac89d0053f048d68a3b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 076/462] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197cc..d041dace80d3 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0087b24b03a3d21a96c6def3c33d12f2bf6ecc80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/462] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd2..e8cb892fc971 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From c3336dbe62c076c39733e16ebb2adc1f6e804e84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/462] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad577..7fe4c340a079 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From bc0a72f6c4153fe97981bc50c4edb1557795bdb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/462] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d0..d70d66e4b14e 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 526aba1bc10d74c72cd6b101fadad40bb06f9b75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 080/462] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c06..1a5eb3cd60bc 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 1b0d1f75a4fb9610c63c876472800a6df05d8400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 081/462] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b3..561f7f0b1cd4 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From f01faaec69a0c6df519fbbac12424d6ba84a8573 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/462] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e121..a5afbb3c3b4a 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 5f8761932a53c6846b3a7ab40a1751c46247f58b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/462] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1a..ea63f7192843 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From bafffe37e0ec16f26e7d523827a74150e5b19c1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/462] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c7..148b72480894 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 32ad72603ff4cb5a16baf6372780a1b942860cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 085/462] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd3..115057b6d424 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 7de40b83db8286d9e9c70049afba616dea60ff87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 086/462] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f9..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From fd4c5152fdcc486f4dc863666779ac6787dffe29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/462] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca4..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From df4473b9bef4ec126002dcef0ff19eeb31e5cb3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/462] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a8..3f7ec840d264 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 052ad0316f92240ed8d78c97cce3e9b58a0f83db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 089/462] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7f..d1d83c202269 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From c1a05911c0f56498ddc6919a10e81fd6d6389b54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 090/462] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef9..7d4cc54bb192 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 9d7fd9ddbd55e536f5d7ab5e483c333582457312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/462] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e0..c1dfb792740d 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 4375fe9e897310b0cac5a7ce612cbce9e925d75f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/462] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b0300..3d141bee627b 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 369ed2f429eae4cfdb4745a5c25b5b0d5ec8430f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/462] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af8..c2ddfde9fbc7 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From e25409a26448598254d99631a4bbeb961e835279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 094/462] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51df..bdbad8e9c2bb 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 5b98a302a62d123697647054dad43adfff167570 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 095/462] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d21..bb301c160201 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 8330c621dfda2ad164aad7e4b8a00f2b225a1fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/462] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d451..0f81c8dc313c 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 160c2b1990dd6565d3606e86607ef6f2ef91bf0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/462] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d3..f2c1721ac5ee 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From f4e34d1058a2573d39b10e91aa9fb54771b6ef40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 098/462] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e11..158a5c5b7954 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From e53b21b4161df67fbf9a558ee83feccca092c4a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 099/462] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b8..8f104462ae56 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 24fe53e070f59cb1d9c11d39fdd21e879d0321f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/462] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c8915..29579786726d 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 48d7a6a7cb64524bb691f216e6d4f482b7042df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/462] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1b..22336a264fa4 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=2
+revision=3
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 616649700dcb8426508d6ab738f308935b2fdff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/462] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e9..37a8467653f4 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 3d299eb443e80e920842b7c5a2b6733e7b9c04f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 103/462] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805ed..c0cf0340566b 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 0bd67e0e31cef7b96f0b7dc7f354e8bb6ae164a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 104/462] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0bc..f56e0b414b24 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 9882f7597890fe0cc69db4d0f73f50c61754e503 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/462] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706af..89adfe051249 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 14c53961d8664833f183fd9188d83fa693dcc139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/462] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac28405..3b300024f05c 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6e45f60ee09d1abfd743648795b28309ef22a7b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/462] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f264..ff5411c3422b 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 3760bda2d127fa2f8a4072a10a5675a651890789 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 108/462] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf170..90b8de48193a 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 428b95222921dfc7dfaccb7967f2c9cd74a50392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 109/462] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cce..41bd475db09e 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 6ecf8003947b7f24854fabaab2f8b382a71a29fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/462] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dcaa..2ccae03e3065 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 7e66a644cb94710459516351a62988ea7f31d126 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/462] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9cef..20e16a32fc0f 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3b431d6c3d4cf655756a03b182a774b911522fd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 112/462] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8fa..397508c55a3f 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 7e8a313e02fab1ed3cd6971bdd75f57afb7bc58a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 113/462] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec5..cbff9e7ae259 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 79c23cfa9318340a30537d33a700d206a7231764 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/462] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c9..090ec56ca85d 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 860c3fcaf2f1aec1b43ed0eb208ca0a1974c0b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/462] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c52..de188117e817 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 361b408c211473b60e2378ebd90b5f600e00de73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/462] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40df..920d6ffe9d31 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b3c30e341defc70e4041af4b255c12ee313a591f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 117/462] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04dd..3ad8943fb26d 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 3bfd13ae07d8728d0742ea1c11d5783c23e75be5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 118/462] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e54..8f516f768c9b 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 90e8f4d113f7d72e2183a4197148e26c27f98552 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/462] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be65..7b395277e93b 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9d1ac9edb397c920a77c74156387741e5843205d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/462] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae07226..7a1f1477a97d 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From e3c85accb5f04d9bd31e44285d4e2ed4ce4db975 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/462] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 000000000000..18dd076cbd9a
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d06..eab8e525c878 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 4ab6ee87201b5f089069e2798ebe3cb11bd356cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 122/462] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba9..6662a7f65d59 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 00288f536911b528545d8eafc44ec77ee78bb81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 123/462] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f3583..a65a49c48e6a 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4f054abd8bb550bce7e373e364196f3e3d9d7049 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/462] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a84..4d8df6bfd24f 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From ed26fbdba0be0990f0fe3ee31558451afb70a8d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/462] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57ce..003288d12030 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 44c1f566be0004b396bc06c346c5186fc385f966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/462] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4ccb..fc807f4e7c84 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From cf77ee021f054af2eec6e1a9ce0d0d72ed43175b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 127/462] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c817..aab6022e4957 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From ce84f84762f8d6c5f578832fdb646ed392ca5ff1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 128/462] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e19..7fd6b2b118e0 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ae6534a4408cd30242d6ef123947858235ce0aea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/462] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e748797542..d7cc9e2ba7a4 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From ae02c7754465966946af11cd38a7e4b647a5e890 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/462] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa3325753..bff11d8ae5ad 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From c39d2068949fc77fca9759ae0ec4510fdc0f6bec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 131/462] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d23943496392..6c6e2d1378c2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 65c7f3925b843646728d2907baa31da0f377dabe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 132/462] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327eadd..41255b18e928 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 4d18beb6abbc9375a5ff5c9674ff58a753bbd1ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/462] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a2..505360bc0398 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 6604152194a28e57d2e3ccd0217c5f917476d056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/462] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726b..1dda3c2ae6e8 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b855fa217c1589c12f2b5d0b4f55aa0f952797e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 135/462] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d2..6be7b24bfd1d 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 8d3b24ec132487d82798cbbd898fb7a91633bd44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 136/462] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a1..000000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25a..322d64ba114f 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 46cd4393c66911611b926a251a246eb01f3fdf1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/462] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c6057..605cac399d34 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 063f1f602fbe1715af6ad91cb52b69e62868a696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/462] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4ec..6b9d05b03b27 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From b00daf82c17b2cc4a3968deda54197446804e91e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/462] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9b..fb6c96eb33f2 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From c0f31a4e02d2a7a8272f5ba73f21d9f41c0c4692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 140/462] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f34..546c43aec747 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3298a52db614b09956f447b39746660f2ee7cd6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 141/462] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc51..49ae77a163d9 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f0d29dff2c6394900cad426f49895b807cb177f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/462] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa5..a329477e1190 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 07ca24f9935cf17a7d7a286c0bd003ac6df86acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 143/462] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaac..d9a79ff60b20 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 64296c744fceadf587130569853bdba2af1fb4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 144/462] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eba..2722bd6553f7 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 7207e29892714ceb5113b7f109db0ee0d7223b09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/462] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b71..a8bb2d08e09a 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a04de40fba59279bc15b44514a2b288c138d9465 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/462] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc1994..ae9adf37d686 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From d3ca89e4fd8f741dac39cbd61a3f6bafc6850ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/462] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd9..bdd6d2b14db1 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 899f8f2e05bf9c5708dd45b522ebc52b17b6272f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 148/462] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d453..cf17648a4b75 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 4d3129b8691064d528fab2657841b715f3c9d652 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 149/462] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73f..6ccfa29c6c8b 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d764257ddfde023c89a48b04c75186bffe18c357 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/462] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be5..918f1604061e 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From f3e6de30e45277fdc09b28e7e9cf138815e2fe48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/462] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618b..4b6c741bf25d 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From ee8225ee3da66873f4d6739a5a29e63c69bf1b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/462] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a4..9b57379bfc88 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5728c37d1c9063382565212a808d433f9f8a892c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 153/462] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9c..0291b28c4a18 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 49bdba98a646d060fbfb7a08c558b9fc88856eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 154/462] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f475..5dad32e38267 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 83a67ef4d8b47ae29180fe86ec79e1c7226dbf05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/462] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c22..f719ab4d3f1e 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 7b95746e2498cb1b98d676d972de6aa912dd7bed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/462] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c219..cadf0f5bb1dc 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From d6ae8741dfc660537b86450bb5c286fd2ffa29db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/462] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c1270..0588acd81bd8 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From a7e432f114d0dd026ad4612a104bef4de0451679 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 158/462] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d13..c2cd5b754dca 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a0bc20ff0328c8f05de2da4147ebe4fca141206b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 159/462] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee566331..661fc934531f 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From c8e60b9e3f7cea3c0da621e7dd16111035e5a511 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/462] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 000000000000..e049a1b8b178
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc00..04b2608684d2 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 9df9d3e7e97015f84961f1c8ddb7887c455e09ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/462] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f19463528..9311fe3afcd8 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 0ba967f9e74a538f2469a43e9bee6e7634923ce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/462] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b2..1104e1a8b3b6 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 6bb666717d00814cff9755dd30449b2b452c4801 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 163/462] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d38..7ae82aecfc33 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From f368068200ead4b0ffdaf26a3ab2a34cc1442985 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 164/462] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a133..06ca6e43960a 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From f08a12c4c2a9545f9d262f8ce892f45ef8766a19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 165/462] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f3215804..eb60b9fca0de 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 8ab64aca504b2ea189424fa5a4a9464ee0f45a1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/462] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c126..ad455be556d6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2e5f7b2a163bf549f8a8c0a231f138e75c385259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 167/462] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda15..181675b6f3a3 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 0b34bb81f318948ff30a057c555bc0f20ac89667 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/462] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81f..4178683d5de9 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From dfc26568640833ed71fb23f59955a3006cedddd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/462] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224f..73d88a394982 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2d5b7f57928942bc2f2459d409f11102fe28e528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/462] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea59..63ec23e72e07 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From d0a43f72eabb7491d6aa52351183fe35bacb113e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/462] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da8..49f73671bcba 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 0a702cd87299c0303cd707cad2058fb188dbaca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/462] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3e..437ff757b383 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 11ba4eb5c9d3d08f956c94941df1abec1d60a638 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/462] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f16217888..efcc71eaaa61 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From b34bf9696d5bb03c3a418a79d7e0d8ee19c92c44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/462] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc39..a3a17c73a84c 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 38e10e28c4a54305d20e2e129f61fde3c37d247c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/462] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb41..35168db82f93 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 7e639bbbcac42316f07483c55c1e247c0300113e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/462] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f8744..869aecd1b4bb 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 0bb857fea48cbdfd5cf00b6ca745edb4bdad58a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/462] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb9..bb7e53221866 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 221e9128c2125645e4363380b81c08213ce51bb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/462] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe6..fa18e58b7333 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 54324aa1e712a8ebfca3e426eecb53bb833df8a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/462] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d941..45072e81b820 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 5b9e812d2d9068a8e20e8cd91e5ad561db475a6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/462] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1a..3557648f8164 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From d953e61563b94ff756b730180d87a91c13ffe1b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/462] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a5..eddadc647333 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 4172b035fba52a1cd85071839b1e328647149970 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/462] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82dd..1b0766e194ab 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From df89f825ffee28944554d849da7327e3df0adb14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/462] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d912..b83fc229ffaf 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 6b15ff907395590d7b64f841cc9dab4e7c4dc0b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/462] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b7..7f0231c305d4 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From d02a56ecbf2128261d8bc1d355c76b37401b250e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/462] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2c..78d19cba196e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 6501fe35e4a11364f2d7c51267caaffd4705d870 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/462] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c74..0cbb7f1e70f1 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1ee16ff3025ca51b852d7d7a3202956096c04a98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/462] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af8..4eba212dbbbc 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 328a1b722f32928edc251501ca1b065669b21f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/462] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c901..5c5806d3cf7d 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 9eb746938443d42ed20442b846868cb0fcc5effb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/462] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450b..e1703b4bf9c0 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From a525684abbb834c6a6e4c25df3cddb82d829d76d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/462] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecfb..5493688b12eb 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From cb2a5fa3e6ed081d8536208be64607873f483e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/462] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b3..9d8e339b979b 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 09823440fc252b7ee5eb4e67a5be72e454d3ea82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/462] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d8..c8f05d1d3459 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From aea4b1b46ac63eaa40b4d8820127b3d552d83497 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/462] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2e..7bede2a16e9a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From d5ac44dac9b5652c7b1f5c600ac453a2c9820d5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/462] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a4..e4cfb3777b71 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From e29d81312288404267e08b9d26a7bacf4f6d0129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/462] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e87..c53d0c1b4b1d 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 755949a0d73913cd7174f25cc3eb939036f09a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/462] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d2..4ac918f807ec 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20201120
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 64169b82727cfef4f51d3c5e5ee8f3a8ecc178b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/462] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef693532..8367a705e0b2 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3a4de7455a885729f7200695bd87f2fb0d60d9f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/462] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2b..3abdceb0eca9 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From dca2edd9519161b05c0244f0dc0afe5874f34fb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/462] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e89..69bb2a788e91 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 0672d4e4695e4c9b1622b1c85a5a520c40533878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/462] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 000000000000..afa077902d9a
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f8..3438dcdaf0ff 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac73..2bc40e253d09 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 14efcdd06cfbfa6adae61abf7fc12cc0a0e309bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/462] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df0..a91ff22b098a 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 77ebac7a94a11bed45fa681a3c5ec8c636e44eb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/462] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 000000000000..a83f1ca7b38d
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e3..0f4f1ce5a3b4 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From bffefc523a51c50ac519bbb5588519f37e98acaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/462] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999de..2382d7d337f9 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From b0d019b62459c482e37d3d32812687dbd3e0b12d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/462] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af93..a4ec485e23e4 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 1562e8d798acf801a06f70699a557b3f38df8427 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/462] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec2873..76d52cb3f221 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 73b7cae0e98ab603aa9efaf11d8a3c739893dead Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/462] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f2..7634efdfdc20 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dcdc0aaa530133ebc5238ee331849c912a036261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/462] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a1..be65950c14a6 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 6725a9d5bf0ca7b995d9633fa631089824933356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/462] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf813..9b507d649fd3 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 4dc9d86617973db849011d2e44cbbb0639c4b2bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/462] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54cc..0c234f74d824 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 084a3c57ecc76b19ce4f8394018172ce98806e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/462] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856f..6a598b0909ee 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From efb2133b78e205ad24c8bf3ce7cde9b9326ce03b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/462] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c3394..fa88f33f92b7 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 18054544175922ba374461914750c7eac532628f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/462] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6cd..bd1e069c4b7a 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From b4b82c0aeedb623e7acbd3b956353c7a8790309f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/462] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c8..3dfdc9154f10 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 453489380e55127d6c73105dfb50e37b6a7cf231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/462] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb7251..7cd8308b0498 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From adbccd505ecdc6234e51f7123cbd070ab0d3db75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/462] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4b..af670232cefb 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 48c8ae6eb03a5203d71c5a5a04736c66079801d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/462] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 000000000000..3957bb12bcb7
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa31995..c9d0abfda66c 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From acd5c597cdd86c60728b5669677b95397ae87485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/462] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d725120..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From e254cc821849e916c6013322bfb8be6d221adc49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/462] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c5..ba4e3cee2e63 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 46dddacaa5746a724fc211eb942c7429850c2b5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/462] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd3260..596cd849584f 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d63d7ecf6100d47c3deddd2f1f8b98fab423e6ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/462] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5d..10890fec2a47 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 3db9b40c65d8429e6f7287edfd05f9f6a26e9c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/462] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a13..dfd8f6594921 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 297d82b14746d82ae8d3cc0826a364c81c995851 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/462] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5a..145a0b52e8fc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 9502debe99b31fb94a7aa8ebfb22181ef625aaff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/462] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb4..a1c1c2a910e2 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 9a83ac7946cf0cad625ba8585b1e7873d63cc189 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/462] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b7..eef0965e2d05 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 260983f7280822d733a7d7a19fee1994057df014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/462] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36d..2b2169eed3ce 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f7e309da4da25ec59c7f2150cc63bbde79c899a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/462] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b9050..d23aba0468bf 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From a95aee8c64f402bb0ac88ae4214669583e4206d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/462] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae42293..7c1b5034a28d 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 9e6ef66a024daa183b355f5c89a7f3877832a437 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/462] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc92..eba01a0fa450 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 29316b41f8b9a620981db9a94c7a65ddeb07f765 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/462] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 000000000000..bda9a37a5fff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532f..507448245108 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 8281d018fb4e16212b698396a442e9e255679d4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/462] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d93541..4813a8a250dd 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 5125dd02f45e3acb31187e494b5d0edee8ceee2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/462] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a4..d55a7f21272e 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a67dbb77d6b2926929beabc5b3ed6ba276fa76f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/462] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1ceaa..0d6407501fb8 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e427a9d9d2b5ef1c9e0ad9130fae5e8565a1efa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/462] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61a..ad093d068402 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From a0b8c57fe865125e657e59144ff0fea425b6f52b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/462] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e01..d81f4b99f7a4 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From f5b85e69d63af4e69e9f27a8565d5eb1f677a06a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/462] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13ce..dab8099adcdc 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 31e959c37013c532961579eaa470afd96e74d10b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/462] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c3..541ad9a6e039 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 543d80cc3979409d3c8a0860ba294f9dac23e095 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/462] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930e..e1d6500e207c 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 7fc32e1460bdee5733520a627d9efa277ed75c16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/462] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13edc..4a55528f83b5 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From c4d22dd29bc525e5068f8973fa1bf0b3f234966a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/462] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 000000000000..f3bcf8521508
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e8..ad2465b3413c 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 4e738a7173b4589bad4a41008a38357e66f26641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/462] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a3..b501ed9385eb 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 0cfc65c5e7f6448628cb57f9f052b9eed72f0783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/462] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035ad..9ea248618f43 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From c5c657251dfcbdfdc2baa1a7bd10ea2e87ea6dce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/462] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a7503819839..40df186b9387 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 0e61afe52b8ca47e6c92dc4c7e2e4d86ba7ad00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/462] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6f..c94ead90e9de 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 248dd3d970c1ea74c3a7614e4be35e2421475438 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/462] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730bc..1be136f157aa 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From bf85e75bbffe6d51e751462e4f7fba3ed6ce6c8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/462] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe177800..9c157ba6d615 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From cb1487695109763d7ddd3c24fef8ca695699b8b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/462] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19cc..2fdc03e3153c 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 399acea2c7fb4043e9e55bf9c2fe72fed3c1f9ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/462] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c0..e5eda8fb05c4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From cd95c741eec742bbbe45394e19bdfc304c2d075a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/462] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2ab..4714ae62ed3d 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5e89597fc13343e1ad69435530e6a6d042a15429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/462] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17bb..3c0b8fb730b9 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c7db3b52cf445a97cc7c2749aead01d66c732561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/462] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc78..5986bd713fd6 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 8fb72a714f5dbddce48ce1849e70270b6210b145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/462] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d347..ce76d7c0c2e1 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From d4e64aee5a2b7ebb0400cd03d37e9c2105fe2408 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/462] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b700..01ddc8ed7322 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 48061130eb64ba10f1b8bc14a4725f7ad810994b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/462] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c9..fc52e87228ea 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 94c3f641f34448dfb91ddc471102787b7e8b91fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/462] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a8..4c684d18f576 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ff25794575fcf1352fce1aeb903112a66a477e75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/462] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042de..0a0ccbefd5f0 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From ed5b72f9c8b16ad4be34d9977b726773ec1c86b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/462] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a95196..9fa79661ba83 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 7fca3355ffe796f5d81134b6090b831f019b9f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/462] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383b..e985ecf8534f 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 50d21d843b7dcb7a7526dac2a29542d0bf6d7c4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/462] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb81..f73f4c555766 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 0693aab4a38762549b265c017ce5c664d40bc144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/462] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2c..9e1cd59b8395 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From f1515126bbe3870948907d1c6832ea9ee698322f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/462] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e80..02c89bd1ccae 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 2bfee14b6abd9388312e46fd4e1ac94f625f01eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/462] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c66..000000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83ff..613170928016 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From d91101671b9084ab79df2c50008230902c0e211b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/462] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161d..95ad7a333435 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 091be5ecefc8d890c951a1784c7bed72f189e91c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/462] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc9442..c392e3c0e2fc 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From a934b663de8f40b98bb0ce8bcac66a36d89cdd08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/462] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c1..5aaa5d669b7a 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 5761eb9cc2816b254982d7664a30a5219c1fe42f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/462] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b465436..3bef9dc2b477 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 4bc7a9533c18e1f61ba329e92586c011d5c7b978 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/462] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433ab..53043809e675 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From b9a1552f348ab7f02d1d8e90e94e76be36f88ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/462] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f97551069..fddde4439ce1 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From ba91081f7e582a3f9386d542aa5dbb4f7151d4c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/462] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb761..90b4f237bc84 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From c2afe6a7bbf6b4ab22ef86cd1de1fcedb2a8c64d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/462] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5fd..b00e8ed63e98 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 9c92d397e4d989d342f7a8f4b57d3d2ff73996c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/462] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc193..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From b8bfa2b73cf523a153af9f7937e0296698010eda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/462] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce86..904bec8ca964 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From bf2b4fcb1dfa8e8d02f7fe88b9539fc4de683590 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/462] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d1..a1df98d33f52 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 5629a5cdf6163ab7af0a43096876db75107541c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/462] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f186..911122cc807a 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 418d158c6b88959e99c91c374a25eb26be52b7df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/462] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172b..f260af814c68 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 62e8843398d91b2171ba348c2334b3552dc075dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/462] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71ff..b733afa1a7bd 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 7b7cf935239f969705f3cff143757a0c9e6460e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/462] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e2..5d8f2bf185c1 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 8e499a491bb15a345d6e5555f89da420bfc3a4a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/462] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5e..e4f985f74ec4 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 94f174b456742f66c7674082c42f715a7c8e1dca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/462] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b8..cd63a895863b 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ede6bdccdea65e096b9dff7610e1ccff2b6b4117 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/462] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b3..7ccbf82bcdff 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 0c10056105916ff254181fe61917a7ea56f28dd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/462] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b271..6e6c32ddf3e7 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 300e4ef28a0e070ba752106d2a25c602cd77acb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/462] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a7..8d313c2fff1b 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 5fa88c02fb7310a451c33e7077af3577d3450d27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/462] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f9..db394362f188 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 74663ddfc50d495d0dce8b2e37777e20a130fcd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/462] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c6..a9ac8a6d35e4 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 10f2e7bbfc2f170bfc376186e10704c32a32a7c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/462] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef569..95e84d22279b 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From dbccc4b7a9ae372f9f5754ee3a4f91e599a608b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/462] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f5269..119546b61ea7 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 1b657eb1c6553810500da6a46ce0a8cc5d9f87c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/462] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a0..95d398859836 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 8cc94c4bcfa8edcc16053d4a2e159fd70b0798bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/462] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee3..b46c4846b914 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 2122765a981b22a94993b85fb8bec37736ec4a8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/462] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff847..54beac3b4520 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 4d8e03825e91169cb4d811e66cec2d8fb7daea9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/462] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b955603..98559c4a5077 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 471818e252c1b8fdba600101d566db527b335056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/462] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b2..b61e4e8d0965 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 634577ad86ac2cf8c74c4432386cea3b99b15d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/462] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011a..765b0b00959a 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From fc76151a04f596c80156f86c70a04d8c9f72e0ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/462] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e22..19593004ef06 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 0ab4e4537159bc56c6852d3fd92843a9f78f664b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/462] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af1..8dd5947d2690 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From ba8c91cdd10482845fb3f18abb078742f19fded6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/462] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f560..74c98205efa7 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 39e4ed790b26493b1def9dbe0d0a5b1eb7d37a35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/462] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d2..95b7c46373ca 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 02de1ebcc6795681a266306dff174469c7cae3cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/462] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50e..abf70431e843 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From acb4a5400e0b70081eba54967c22ffa2098af544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/462] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f4..e26d066c062c 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 477684408d75356c0591b8622972240015f93468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/462] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d0..54ecff002a05 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 291af795a72e452b7cd238fbdd1591d1626aac12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/462] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b7306..519bc615782d 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 27a18e0740a7543d4579e651ef75aa9c1178db4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/462] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8b..ed76890c0575 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c550e29d028cc6a02938fb0d2de847a693b1ee33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/462] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56ce..969ef1eb5d78 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 55d3e6ecea2099b82e19cc3b96a094bbb896b282 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/462] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6a..8cb273d927dc 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From d541a0ad7c962587f05c5d44e7c207fc4d199b91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/462] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef405..5df8312b53dc 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 76f3dc502b2e23cbefbb175d624b1cbd0df4d270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/462] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d59213..0c4f3b4f130a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From a5a3eafb0f483bc5c8b64ea02ecbc9820aaecc0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/462] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713b..c1112d0443ec 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From f02d1921da5a71bc35be5156d2fe47ea13c296b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/462] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e61..b47f44502eb2 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 70e0ca5489dc5f6c20e21ed73076b260d3be12c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/462] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc5..56fceeb4c436 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From cb1e23aff1394a2e75c61fc125e591a2799ccdaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/462] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5f..1b55d262a2fa 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From de040b8ef4c1cb7e1d083c4794e4cf9b8f355adb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/462] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c76..decc27a0a27c 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 283c177d9ff7eed47078db63f62aee3526e313fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/462] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b40..72b8a1117c2d 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4b86cc55fe4980026fdf6fa4313b2dd9e5b3c9e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/462] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aad..b339ce146d79 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 841528cfe4fe8edd1724d9b732e93ac29e21e7c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/462] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a61..5778f4c2d76a 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 3588aa10a66c52887751a67335e9a951d4c9c385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/462] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0ce..8c3d2dace29a 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ae587040088aaae1c0ceec21079dcb603660a764 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/462] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13c..1d4575336174 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 5d2e10058e9c3613040fca76c367953317167a14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/462] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52a..9ac4bb481c30 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 019afe0ecefd2f90e212bdc3f20c8397e568ae69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/462] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14f..1252d5a17348 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9a60748d1a13156ddb88b0630c57ebe217d8cc34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/462] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd2..f352a5f3fd60 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From f9d841f8af675fc85a681f3c2f45a8621a00289d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/462] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c0..c0b75c164f25 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 70bb72d54bdc041a85b4c32b4cfc2de50cd6b03b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/462] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d3772..3c3dffc63388 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 3fcfc2dc8548e57c3dbc6ecf020195d9b5fdf1fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/462] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515dd..c581d1653452 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 668567320543e90c7fc20dc4cb390b7e02f0e559 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/462] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a3..5a61a0a2bdd3 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From c21a3dba8982aaf5af420543a69580db28028853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/462] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d107..5d962adec91a 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From b3afe003cd094424a78da8e7665a7bde54c74aa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/462] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e9..e870724e1d9a 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 22810023ee2f1a51f30d74b3d2a43450bb14dad3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/462] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f4..230ecb592571 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 08ba00e754565ad08109ef082ed0f235f91d14e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/462] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e4..afb4625abc13 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From e9751a4a709f03fe06df3d16e5d2836f6ee51ba1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/462] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d24..1f2c6c36793c 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 519f18975384cdc88f4fb5249f1d3441f9effd93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/462] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b586485..f0c6347e26e1 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 33f9ebe6e99dce3d71cd5446eacc4ad7d3b99207 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/462] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c3..e3046ab968e6 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 17199aca2f83bf322d335a36e0e6716f2bf0fac0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/462] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3c..8cf9156a3c81 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From f000649406a11363153ed15fe3f05eb1d95d0f8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/462] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a92..8fb4fa5ca443 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From d07decef0205a4b4d8481c0c0a0b5652f3a0c5f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/462] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a9..591697d20cf4 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 7cc7693eb4c957fd62df9e6f7b727276f4c0ca62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/462] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70ac..5d0efce366ab 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From c8d2548377e008f5d24065b6848ab16f1050609f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/462] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcdf..77ea433a1073 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 351380c1f215071bd2f8968ca7a96d4d88dc9a32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/462] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d4..d6b4f67774a2 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From f98a996b56ed97b0b9223777ad7c3d6f3a54f0f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/462] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34e..498ca5775a82 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 04d23575e7cabb691c4ae0a616f6eb77081497be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/462] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c566300075..866fa5db3054 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 7543a46522f5d6a30333e55e1c93c7bb90f3ea81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/462] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f3..8befde6048b9 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From d3dc8c1fa4666840a1e229fc52add2aaef348c45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/462] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96a..a7effa00bcb8 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 4368702b6ebc8c062a8858b69ce05ea346956e5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/462] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e554..7b9b5bd64a0b 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From dc67512e4fedc888bf41d5143a9d663fc1120eac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/462] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f14..346f8a411742 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From ad5186d1c9aececeeedf7676852dc04894848aea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/462] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f15..064fd6f71f5d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 47a314113f461b91d48e052f70e1f38d04f45eef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/462] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b51..b2deb5e0ffb8 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 616f8a5f505f4c10c41e3c02649c5ee91eb8d695 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/462] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2da..068c21944270 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 0e866d708c8287c91b55bc7767b898ea515919c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/462] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436d..4b8ff04a9ebe 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From a323291af109bd2e1d6f0ab2cb411c859baa8198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/462] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb79..79117d197a99 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 90f41961b2567b13fabf4fc06856b5683354200d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/462] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60f..222f434d0bc0 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From ff42dba97e2dfe1e8c5aff8b9deffee2ad0f7f59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/462] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc5..16bf4155e7b9 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 32beadcf8c06e24e854bb58f83436ae293445a02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/462] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c4214..e4ee1de46871 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 3fc5f5e17e54856f4b67f8a67721eaa163414916 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/462] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27fd..d564b5142ca1 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 07fbe02ff84e0e6845b0c29860c7eda3bf0b03a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/462] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f82..668ab97b1a7d 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From f5d0f5438b3e3331aca6a2bcf1348e0a32ca86f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/462] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2a..14437beb5384 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 77f9859712a40e09f8f544441f60952a9661295e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/462] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b368..c660d62461af 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From c68b4d413b87c04735b225f4b1accd286057f92f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/462] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77c..ce1190b62f00 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9015641eb7a9ad7baa1bcbdbff56bdcccf9386cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/462] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef0..b56a3aba18bd 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 9dbe46bc302055f9961f2ddbc729c29d3feb36f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/462] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b9..408b3fe11407 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From d033dfa2f595d5d731414cd54d8838d5076310e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 356/462] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e01..02ca0634bb25 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8f15dd410c9f0edfbf2a9bc78147f45b5ffa4a04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 357/462] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f7..aa80daaa0055 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1e9a7f3c3471fd39eaec56b782d28e07572db6f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 358/462] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cbe..b36c9b36eb53 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 8511dd9d26c49d81508461c5df2d557a7fa148e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 359/462] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 000000000000..a8552ff26875
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee4673..bf65dc7277be 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 68e16f507cbcd5e9813a53abdb6603b189f9c69f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 360/462] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c79424..719df688847f 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From bc13270393837f7dd7a76015c5f2fe86052a4c09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/462] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c3..20bb5178fcaa 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 2d6b44133e3f99341cc15e17b7309ff40870aabd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 362/462] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc79..e2fb62b08d8a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 4b5a516e327cb3774809124272b634f3f5c3daf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 363/462] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd118477..da1685b6600f 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From be4e08d7c3612c6fb77b0f46f0c92396b6fe4129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 364/462] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac06028..e8082064f764 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From f0bc0e354b77b1345215be776ffc85e1124e0006 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 365/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb843..ccd1f994c15a 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 8a56fdb9892d59818c1fedb5606f454691df8aa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 366/462] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19d..1e5ad3257337 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 8b2939fcaf4e75f7b4e4c7791df537d4408444ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/462] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a8..80f59c1a7af5 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From b0c9bcddd810ff6039deac96255d45e34a1ad672 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 368/462] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2ae..748222429091 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 32020b1483a924746c171c3e1039bad70bbb2a21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/462] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb470556430..b4145ca7dbae 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 958b9a6dbce1b10b733c077442acf2190b5b1610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 370/462] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e4..167c74c6ba38 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2d02545245b7c6d342b5ade1ec63c6756f5bd9cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 371/462] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0d..84bab43bb5bc 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 5f1a20265060697dcea199d408bb9ab7b9c8ab30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 372/462] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b4464608..ab34cc264fff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From c8aeffe532f61d24fec8d1cc5865d5fedd059b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 373/462] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c959..e7835044f911 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 845ecd08e3a6f5c6b41be81973f011cb6566fea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 374/462] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f76..eac1ad48c1ec 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 83a505cda15acd18c66ad1757699273b96fd32c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 375/462] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d689..bee02ae906ef 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a23d13624e5c92984fc5a3947aa2211de1d4b52b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 376/462] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c3508..5ba4d6a33c3c 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From ea4a1f451a98fa345677d8778ed13a5aa76f82a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 377/462] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5bd..0b50f0f9f04a 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 87ce85163a92fa6f47f636e68904b09a0c448e7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 378/462] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8f..098a6daa0507 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 4f4b3c6f0adfee61459d4cba5c3b4e76c46f197b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 379/462] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054e..20eb3cd373ca 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From d2bcd4f15ee0f9eb956f6c7c74b0adc0706b5215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 380/462] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d512..dd43945c15e7 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a0aa9b253279b8e010692d94f243057020ef0e4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 381/462] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ead..a3760e4965b9 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 61252d84602187f83abdbe2c2f597d2565775f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 382/462] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ece..430fb02e6cf0 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 2094dffd5754f95c69d2677921725c504a59cf55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 383/462] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb60..d0707326324d 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 430ddc5e6ce1bb5e31a46ccc15bcbf01c7cd645a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 384/462] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 000000000000..dc807dbf6bf4
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40ca..bf42f9e53c25 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From af1b9e7e14e520bb2338c0b28e0d0c2f0a862f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 385/462] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46d..fd5b877ecd21 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 2a779849d16ca633342d4917c7714e8c00934dc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 386/462] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2ca..02a301eb639d 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 7af101d735cc8547efcdc3939c83bde28b7dd8db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 387/462] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e455109..0e1d3a5445c3 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From a70405b6997b2d1194bd142aee318ad2067dd1c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 388/462] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a04..0d28125a75f8 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 5306567bd8e2f8fb01d81fe85893c8e6bc57f140 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 389/462] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198eb..edb108631ae4 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 5f128554dd1188f949b63e077fb42e20a6c96f2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 390/462] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6c..e89a169ad612 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 7ff9b9b8ca471016cdef7a97f85a2fea636b8807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 391/462] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de4..748f904ee1de 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 49281d3faec3d5d6c6f4302fff6c94dc5e518875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 392/462] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4d..b751d6d89f84 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 58459b8c20d632b665ef1599fea8ae77165834de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 393/462] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5b..7e7177eff699 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 340237088b24f47e352072d161e39bf960c802b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 394/462] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc52..ab11b171f8c6 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 04b3194d883bc5a6a947b16819704c345137e415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 395/462] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6b..29c0f10ddea8 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 1895be923b740e5bbfe8f2a920f8c877ba446958 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 396/462] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11a..c4eab0c120ec 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From 253fa9a5936292709706e64b3f1d2c733c07e4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 397/462] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762a..f64e68bb4591 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7471d2c76d145c08b8751b276c6b64b1589fafbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 398/462] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6d..16b6b68d379b 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b612ffe3a28a032e8757ab4334f21a057de472a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 399/462] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23f..d1660a8a59dc 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From b542ba1ee13f516c46ccebe78c2a95bdebf9d033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 400/462] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa18..7063efc55758 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0659c34d61c263dea76ae077d43e4c028017ebfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 401/462] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd0..3878ffbb19cb 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 0235f991fa2630d494f565cc365c0b6b0d37566a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 402/462] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472bf..af49371f2303 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 7cb42145b2e9526889214ccf72c1ffa6e6ec5ce3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 403/462] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034e..626392bc88fd 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 155923b20b0e622b3d348f16354547cb6b3e5b5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 404/462] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8a..03ac932eac03 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 83800344d5b7617488983b47508e3d8453940d79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 405/462] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b0386..a131af6c7f07 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From d4f2d5de138ac63fa5d83e6675ae70a664b5551d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 406/462] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc05..1fe4e2477e1f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 6abb272df79bfb5eeba9dc2fca68d1664207e93a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 407/462] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c30903..baf721c4160c 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 59b5cfd43f4ddb2ac952dcbe51763ee32f1bec56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 408/462] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2da..f75ea181344a 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From b0258ab485b22695368e2248f45ff5afd637ceee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 409/462] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff5270..46fc8773520b 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 3867ec830a06cc31cc498e165f1ce4ce533d9caf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 410/462] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d7..9649421e7938 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 106f58590fb07f0c74f209133bebc34dbd3ad6a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 411/462] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caaf..032f10234ea5 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 5ce3784c103c936fa7fd499df73123f406aa65ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 412/462] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425e..7b64c4ccb1fe 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 28a5853ac7b42c6b67be7c51abe09793de329ca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 413/462] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1a..84b5510f5983 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 72572311f508c792d8871fe7a75ca61aae223c2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 414/462] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb616..fa0d55fc4aec 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 04133586bec399dea9adc49c34c1c7c0b6b7694a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 415/462] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e5..000000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b5..12db4b8c9c57 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f4b779a4fc52638188dace21f73f1ffd17ac887b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 416/462] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641b..120039714059 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From b27309c3f601521da267e53dafa5fd88494c55ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 417/462] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0e..092460ea73e5 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 3034f8075a6088eca3b94effaf22df369fb7c144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 418/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e84..5accaf6523dd 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From d9b9cd8c35d71ddf409b52dd738ba3b9f7d2428c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 419/462] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e6..514e22f76554 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From b00ec6dc5b115ce4479a22ee271499db49a94875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 420/462] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f859216..d3fde8b73b6b 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From f1037c6f188348c27a9df0dd7b7539c704ac44df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/462] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69b..166f5d9c9ecf 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 3f6b716c61784af5e280c3dd8fa61db845188ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 422/462] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c285..e65ed2c9ed8e 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 1c6ff4789b5c77d2ec32e1f1010e9358833590a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/462] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6af..b24e3e483950 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 5994dabdc5484643a5357b6b7247d27855cba251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 424/462] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d26688..41ebe9dd5640 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 44f5bdae211be24eaa42aef2a1c94605ace17c05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/462] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12cf..1455af6d35bf 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 8b5bebc9aae57923dda8e88e742b76463dcd85a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 426/462] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63e..f921ca3fffc6 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From f70b8aac84339fd84176690c343b3bd15ca1d302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/462] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d1..5a3458eb4eb5 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From c8f7c0e411ef9c12b814d31cfca659eaf34ea5c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/462] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5d..4de620fd6038 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 23c86c22d5a6934e78241595e9d69c52b43fd47b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/462] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3be..40ee7f6bce1c 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From e6337c4373ede7871163244403b89509331f5808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 430/462] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda1..48fbd4045ea4 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From ecea542edf5ca2aafeab6a1d9486dfd0fca88b08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/462] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c6..4c7cf99afea0 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From e0132239f24a9ac0aadaaffeacc739020cefd809 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 432/462] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c7..1049a1594d06 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From b7f8349d4e1d739c6e3aa8588f585a7d26d8ea40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/462] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d35605..bdc35ee2d846 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 23890216eeac50660e0e864c43da4f6da88bdb5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/462] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c1..ea2df7449793 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 7eb5cc2c626764ac0387cfffca0fa0e50825d0a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 435/462] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab2336..b3a5b7fb58a9 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From f0e68ae334f2c1d18f6084c63b10fbf008b84aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/462] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f10..9e1084749f4b 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From a0aeb4de8be0580b56ca3706e984c469da866e78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/462] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad640..bfc01d1b2201 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 8b038f9b073455c3bde3c9d4bcc77b31159e9653 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/462] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44d..deeed973659f 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From cbc11ef3dbedcadf3751f37720f421523b473f02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 439/462] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd01..61ead1c9e44e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 8580444f6a807943681fc1089c28e4c530e60a9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 440/462] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34a..33907bbd0540 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From d1a9d8e6cca1ab6b24b0d44798713fc11c59b9ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/462] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ece..911072087594 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From e8ddc9a1b33cfc87a05178e436c636174c916f64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 442/462] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1d..1f5c4809fcef 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From bb2ae0d566ed5f946592c9946bda8d13970df4c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 443/462] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cde..80d9edd464bc 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 773e41e13ae76f79bacfd7d0c4f2f420af3c35c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 444/462] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b53..000000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From eeec124dada264df774f1fd449819ee6990a9e2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 445/462] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41df..9362f5664cba 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 279dec364da38ab11382a2cb448d2ef7df5b89dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 446/462] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da5403..e97ae1cf099a 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From f1ad92818825108789a97e92c5df6a9b4c9a7301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 447/462] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f890279..91ffd8811059 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From b13921400581e4bc9e9371eede87b406201a79d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 448/462] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186ea..27fbe57203a0 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 75b8ba9c31518a22a6774d49a136af5e766e63c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 449/462] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa1481..000000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d3..000000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997aa..000000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a6..000000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 000000000000..b6740ad44e1e
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From f6c6a130cc79b5dbbd8eb49e599fb0ab2e30e8d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 450/462] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a2837..000000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa4768..000000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd72..000000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391ab..235917ab1516 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 4a6cf627ccabfe83b7da14ae77c9c0abc37a3e71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 451/462] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd56396..6c3e6971874d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From fbd59722f1839d74757254f6685ff9f5e1ee6602 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 452/462] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db0..53795ed697e7 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From a8024c1c1291ab0fc1b35cb39f2b264145c2eaa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 453/462] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d1..83ebc476bc84 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From ced676f11d4fb784334e05754c512ad2b813ff23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 454/462] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5b..c56c5dc9ff1d 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 62c4e686b286c8a3daf957fb09217e8b58f30c6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 455/462] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e3..e81afe07bdda 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 26c019eba8ee3d8fd2eddbcb5da8a47c21dc49f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 456/462] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee85..cd9a1fd97e4b 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From ef46958a786a862f72be65606aea2cc0b7d8adc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/462] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d1..295cbb819fd6 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.221
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 02fee8f46336d4160d2dcfbca453ec11ec36241a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/462] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b0d83714ad0f..74958fa598b6 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.177
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 3417aafbb1922195845d43ff21358512b7890b92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 459/462] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6b37aa21b44e..15338123238e 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.19
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From b5dd77099ebe2a442560f9725808a6223901d619 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 460/462] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index ae1a202938cc..16f328c45e5a 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.101
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 703b38137d2143393691cdd978f243c25e9d5ad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 461/462] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e43..0ff0fdd47063 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From b685c33efb7e889e9160c21adede8f1b0d30344c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 09:10:55 +0100
Subject: [PATCH 462/462] sbcl: revert to 2.0.11

This reverts commit e1632b85621c1cd6128a8e659ef2e4a148dbff5e.
---
 srcpkgs/sbcl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0a1afbeb9a2b..1dd77bdc9695 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,7 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.1
+reverts="2.1.1_1 2.1.0_1"
+version=2.0.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +13,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=a9ad892ea038b7155a60c1144801084fab3b2b8cbb0c5bde7e1f42a6b4318a97
+checksum=87d2aa53cef092119a1c8b2f3de48d209375a674c3b60e08596838013bd7971d
 nocross=yes
 nopie=yes
 
@@ -20,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d7935c116af2ecd7485eae54d29491964b1f3ed97068f3127bd8871e120611a4"
+	checksum+=" b7e61bc6b8d238f8878e660bc0635e99c2ea1255bfd6153d702fe9a00f8138fd"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-789160378

Comment:
`sbcl` has been updated again, might want to test that. I have rebased the PR here: https://github.com/ericonr/void-packages/tree/openssl

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-789160378

Comment:
`sbcl` has been updated again, might want to test that. I have rebased the PR here: https://github.com/ericonr/void-packages/tree/openssl

I don't think I caught any package that was *just* revbumped, so we might want to find some way of checking for that.

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-789160378

Comment:
`sbcl` has been updated again, might want to test that. I have rebased the PR here: https://github.com/ericonr/void-packages/tree/openssl

I don't think I caught any package that was *just* revbumped, so we might want to find some way of checking for that. My branch lacks `sbcl` revert.

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-789164932

Comment:
I think `libarchive` should be bumped in `common/shlibs`, otherwise `xbps-install -u xbps` only pulls in:

```
Name         Action    Version           New version            Download size
libcrypto1.1 install   -                 1.1.1j_1               -
libssl1.1    install   -                 1.1.1j_1               -
libxbps      update    0.59.1_3          0.59.1_4               -
xbps         update    0.59.1_3          0.59.1_4               -
```

which means we will be trying to use both LibreSSL and OpenSSL at the same time.

I will try to find other libs in the same situation.

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 4080 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-789174601

Comment:
List of necessary changes to common/shlibs, may contain false positives:

- [ ] Ice
- [ ] MEGAsdk
- [ ] apr-util
- [ ] aria2
- [ ] bind
- [ ] boinc
- [ ] botan
- [ ] c-client
- [ ] cbang
- [ ] clamav
- [ ] collectd
- [ ] cryptsetup
- [ ] curl
- [ ] dovecot-plugin-pigeonhole
- [ ] dovecot
- [ ] dpdk
- [ ] efl
- [ ] freerdp
- [ ] getdns
- [ ] glusterfs
- [ ] grpc
- [ ] gst-plugins-bad1
- [ ] gwenhywfar
- [ ] httrack
- [ ] ipmiutil
- [ ] kea
- [ ] kodi
- [ ] ldns
- [ ] libarchive
- [ ] libasr
- [ ] libbsd
- [ ] libesmtp
- [ ] libetpan
- [ ] libevent
- [ ] libfetch
- [ ] libfido2
- [ ] libgda
- [ ] libgdal
- [ ] libgit2
- [ ] libimobiledevice
- [ ] libircclient
- [ ] libknet1
- [ ] libmowgli
- [ ] libnice
- [ ] libostree
- [ ] librdkafka
- [ ] libsignal-protocol-c
- [ ] libssh
- [ ] libssh2
- [ ] libstrophe
- [ ] libtd
- [ ] libtls
- [ ] libtorrent-rasterbar
- [ ] libtorrent
- [ ] libu2f-host
- [ ] libu2f-server
- [ ] libucl
- [ ] libvncserver
- [ ] libwebsockets
- [ ] libzip
- [ ] live555
- [ ] loudmouth
- [ ] lxc
- [ ] mariadb
- [ ] mit-krb5
- [ ] mosquitto
- [ ] mtxclient
- [ ] munge
- [ ] musikcube
- [ ] neon
- [ ] net-snmp
- [ ] netpgp
- [ ] network-ups-tools
- [ ] nghttp2
- [ ] opendkim
- [ ] openssl
- [ ] opkg
- [ ] opusfile
- [ ] pjproject
- [ ] pkcs11-helper
- [ ] poco
- [ ] podofo
- [ ] postgresql
- [ ] pulseaudio
- [ ] python
- [ ] python3
- [ ] qca-qt5
- [ ] qt5
- [ ] rabbitmq-c
- [ ] re
- [ ] rhash
- [ ] ruby
- [ ] sane
- [ ] seafile-libclient
- [ ] serf
- [ ] spice-gtk
- [ ] spice
- [ ] sqlcipher
- [ ] sssd
- [ ] swiften
- [ ] trousers
- [ ] unbound
- [ ] vde2
- [ ] wvstreams
- [ ] xar
- [ ] xbps
- [ ] xen
- [ ] xmlrpc-c
- [ ] xmlsec1
- [ ] yara
- [ ] zchunk
- [ ] zeek
- [ ] zfs
- [ ] Ice
- [ ] MEGAsdk
- [ ] amp
- [ ] apr-util
- [ ] aria2
- [ ] attic
- [ ] bacula-common
- [ ] bind
- [ ] bitcoin
- [ ] boinc
- [ ] botan
- [ ] c-client
- [ ] cbang
- [ ] clamav
- [ ] collectd
- [ ] cryptsetup
- [ ] curl
- [ ] dillo
- [ ] dma
- [ ] dovecot-plugin-pigeonhole
- [ ] dovecot
- [ ] dpdk
- [ ] efl
- [ ] elog
- [ ] freerdp
- [ ] gambit
- [ ] getdns
- [ ] git
- [ ] glusterfs
- [ ] grpc
- [ ] gst-plugins-bad1
- [ ] gwenhywfar
- [ ] httrack
- [ ] ipmiutil
- [ ] isync
- [ ] kea
- [ ] kodi
- [ ] ldns
- [ ] libarchive
- [ ] libasr
- [ ] libbsd
- [ ] libesmtp
- [ ] libetpan
- [ ] libevent
- [ ] libfetch
- [ ] libfido2
- [ ] libgda
- [ ] libgdal
- [ ] libgit2
- [ ] libimobiledevice
- [ ] libircclient
- [ ] libknet1
- [ ] libmowgli
- [ ] libnice
- [ ] libostree
- [ ] librdkafka
- [ ] libsignal-protocol-c
- [ ] libssh
- [ ] libssh2
- [ ] libstrophe
- [ ] libtd
- [ ] libtls
- [ ] libtorrent-rasterbar
- [ ] libtorrent
- [ ] libu2f-host
- [ ] libu2f-server
- [ ] libucl
- [ ] libvncserver
- [ ] libwebsockets
- [ ] libzip
- [ ] live555
- [ ] loudmouth
- [ ] lxc
- [ ] mariadb
- [ ] mbox
- [ ] mit-krb5
- [ ] monit
- [ ] mosquitto
- [ ] mtxclient
- [ ] munge
- [ ] musikcube
- [ ] mutt
- [ ] neon
- [ ] net-snmp
- [ ] netdata
- [ ] netpgp
- [ ] network-ups-tools
- [ ] next
- [ ] nghttp2
- [ ] nim
- [ ] nix
- [ ] nsd
- [ ] opendkim
- [ ] openjdk11
- [ ] opensc
- [ ] openssl
- [ ] opkg
- [ ] opusfile
- [ ] pen
- [ ] pjproject
- [ ] pkcs11-helper
- [ ] poco
- [ ] podofo
- [ ] postgresql
- [ ] pulseaudio
- [ ] python
- [ ] python3
- [ ] qca-qt5
- [ ] qt5
- [ ] rabbitmq-c
- [ ] re
- [ ] rhash
- [ ] rsync
- [ ] ruby
- [ ] sane
- [ ] scrypt
- [ ] seafile-libclient
- [ ] serf
- [ ] so
- [ ] spice-gtk
- [ ] spice
- [ ] sqlcipher
- [ ] sssd
- [ ] swi-prolog
- [ ] swiften
- [ ] tor
- [ ] trousers
- [ ] uget
- [ ] unbound
- [ ] vde2
- [ ] wvstreams
- [ ] xar
- [ ] xbps
- [ ] xen
- [ ] xmlrpc-c
- [ ] xmlsec1
- [ ] yara
- [ ] zchunk
- [ ] zeek
- [ ] zfs

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 584706 bytes --]

From ef23de9ef6f5151c0c1f90f996201f5a0dfe6176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/461] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 6ae9aefe0e6df685a64fadda39568d2529f01be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 002/461] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..fdd5986a740 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 354da4b1ac4052cd188109b43c33b3960e0a2354 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 003/461] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..95c48dbe8cd 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d76e8ba44909e36288118196ece3424188deed96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 004/461] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..f62a206c1fd 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ef98ca6412db4fb6b1643d28198f1cca42220995 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 005/461] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..b394a98c10b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From c2f6b785c43eea9aad4972e773e2509bfa5064a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 006/461] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index aaf452e0bb5..f789f9478e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From beedd78964b0ca052bedf9b437547aa47d5676d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 007/461] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 6f17a9ad9ba59eec28ab46f80bffe685ff4a3a9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 008/461] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 9397efe4824d4e27aaeea7102fe0def4a141119e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 009/461] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 5efdd3286fc178c88c62761709f05692e5d33147 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 010/461] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a8a5fb10cd4deb30a7ea84d9224c7b2704517e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 011/461] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 13ec40e109619b041cce890f62e2e9bd05348cb4 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 012/461] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index f789f9478e6..9d616c9a6a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 49276f2b43bc3a059062ab664172b97c4c5095cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 013/461] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 9d616c9a6a7..cfbde17b082 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 9cee63b22a0f2a2a8227d368928457932808f446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 014/461] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..854e76a613c 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From b44ad4f4919daa0db31907232f67318406f6d05b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 015/461] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 4791116dcebb52d0abd137fa58357d1e5ae0872b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 016/461] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 6e4db7104dc101e04fd04ed28c73b8d8effae403 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/461] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 623e5c03ed53b66e83ebd00fc20df26104f48254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/461] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 6f6c58cf554a2183510d87ce8be272955b6f6a12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 019/461] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From d6c8264dd928dc9597c8f4f6e619e24c7b0d1412 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 020/461] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 51a122791244c09e53f133159efe0a1e9907b7bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/461] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 8d0a265c27e8b86d1919486c3b5a865c88d0cfc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/461] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 7e5d33a60feb010a54cd3476c0bd07ca13350adc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 023/461] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From e00686f6269f8bc19d8a75a25aeb0672385788b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 024/461] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3d6328b5ded5175c395baf22ba4462a8ed350d1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/461] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 64781771cc551bdf9ff1bd148cf0e97c18ccb9a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 026/461] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From f67546e7bc9f1da86a0e62a507bf6fd8e3809214 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 027/461] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bfc7bf3a98c6d791500f555b40f92d8bc54895bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/461] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From 561afbd62c1ddc98ca2f4e7897a314a76b764923 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/461] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 55394f79b712bec60d585eaf4b23644299410895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/461] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 6d5de5046b9a05551d1e01b7e83ed4fff2e7f291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 031/461] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 8cebc3542dc76fa766a51a18afcd3c8dbf683efa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 032/461] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From f8b0fa8ca76a3087fe1fb47c2bd1628771bc2719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/461] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From d480e62a87c5ca6c17c21f580de3c3d933e1e8a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/461] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From b60f68f895b1693b150267452907c5281bb7644c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/461] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From e6f714d7bbf044e6531281e492f30c1ce0bfe02a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 036/461] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 5776cc9add68340e07d3ed29a6ac2ffd8eb8c3cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 037/461] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From cf2270132deb4b1e858afa1e24e2f45d9a0f7c0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/461] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0d6e8811984f41b776047536008b963e10a74456 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/461] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From b631bbfee6f282f5834ccff6b2b58eaa0f3d8b81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 040/461] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 6305c204d85905f233fce7728a6232b505cbe2ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 041/461] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From d6a4539b40bcffbb6639596a86cf0e1808139779 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/461] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From df5aff97c299cedddb0f5b153eda020d56f7bfe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 043/461] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 73b4b24d0eed54de23812ccccbab32c97d563f4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 044/461] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ebeaa0391aef943897ec5812e20319abe5c07692 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/461] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 90ca9a8c9ea8bb56afe558387650933b47a95a21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/461] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 21d5e499c485e852a2a4188f7fe727bb74ea5765 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/461] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 7a54e124b443dd00a1cebda54632c643a6f8e97b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 048/461] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 750b6b049705ef3ff9220db9da5dd7b9736701dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 049/461] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From f07099fd64decac26d2e8105dc5aefce124cbd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/461] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From bdf1172de59730445c7a7ab980cad8572d06e946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/461] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 344d42e5f5eefa9a047a60e3c511de46f1d58acc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 052/461] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From c9b0a7e2b468daff685e88140bdf04e95f02a3db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 053/461] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 49d025827e98dd0ff6ee8e472eed7592945eb6e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/461] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 5634f8c8e39e3d95c35e4391fba4a76a980e4aeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 055/461] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 426fd4a26254e147b69f3bd5f811a038fc96bf3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 056/461] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From b01932e7badf9348ed5b8c7689f29d061a17d183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/461] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 768dba7731301bb328e9a292d196c37987b93fab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/461] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 3e49f65e311657c7323252a30a2cb18ca929c38b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/461] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From d0bd634b0ba0afa879de848b2d1a75f8bf4ba2e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 060/461] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From d787867e9add388ea14ce0ecfe0e94415523b182 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 061/461] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From 22117f4349aa8aa3b462246fc28f9084a5a8af09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/461] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1b405e6129fb6b2803c2772a3bc6703c1eb1be58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/461] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 0b3ed3958bf95a29cfc827a1e712ede032a57f7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/461] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 2f0bb89efeb4c6ee361c3af342e6f0bdcb10e727 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 065/461] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 1a73640b49358d7d2d919dbb042bfafd427c11a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 066/461] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From e580a14340466f0b6e3726ab5866c66d93caea11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/461] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 84b6876b66c8aa4176079ee3190869fad7e7dcd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/461] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 786b65038cbaac9d014db08fafd5374c5992b06f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/461] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 057f214890552bb998d7cfeaf3ae4d0211a78da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 070/461] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 30246fcfe7997e8632ab25719c39f8cbbf84b2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 071/461] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 336dc3a4650cc1d1fe03f7bce836bc8d54da54a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/461] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From be06edb7f5b6a76fec34437219cefc0300884846 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/461] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 88e25d44790a30ed8feb08dcaf1d6c1e8c6616eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/461] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From f055cbe27f8c5b1fe6bfd64e5c77dffc36f36ad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 075/461] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1455434399972e1c8f45dff71a0bdddc9c550b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 076/461] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 2bff51b72f1c50178c281eafd1e035edaa75b22e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/461] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 72503165a55655ecce66a89165ff1fb19b3c91b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/461] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.11
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"

From 0ac300013efa923e74265c9a08e0e772a585a96f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/461] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 8583f89ace849d6e8a2e17f0e99a71f611d60b9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 080/461] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From fe61396e8a8c03772c0cf409e45b9fb1d70860ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 081/461] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 6b0a67a62788d821ee13ea2300e721b3bef19d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/461] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From eebae2acd7d8e0fe5c29047d0abc0cb96369f7fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/461] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From dab3503fcc58f2c781880269e88cdda5901a8664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/461] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From c3b5cb84c7738aa40ee733f5e8887f6d2abe77ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 085/461] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From c9ec661236223579536faae442578ea8e3b419c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 086/461] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 227d590cb6c932c3921a06e56b7739edde84ed65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/461] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 8bbd8a39a956b3020a1a36fbb733229941750301 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/461] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 363c02a3c4cb8362b12be1c02546017315a5f8b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 089/461] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From f144492a1465f8ba69f87b59acefe1f6affc5fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 090/461] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 476640e6b20fcab788c0ae5e27ec4c6e25f6f530 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/461] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 0f8decf9c8d00b4b9411366df9a4306249aa52f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/461] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From e06f1f55374b546f16b1661d87a697dbc26e847b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/461] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From cdda911d45b9ee7fb94691ac40166f1edd917a03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 094/461] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 020bba1f73d7d9d732d02aa8c9e1130d6fc8d63f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 095/461] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 65296eb76370623ff1be38a6fbbd8d975bd36650 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/461] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 5386f26c6785ea38bad9e18f635ff03cfb4bf5ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/461] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From f428834230721acb2815908c7baad654187848d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 098/461] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3b0b07a285ef43603e5588f836d621482e696038 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 099/461] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 38e862d49183a94f42dbcb00d3246efc92355b57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/461] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e915c4322b8..d2561c9db2f 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=1
+revision=2
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
  libprotoc-devel protobuf-devel gperftools-devel re2-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 77fa158dbefb81bdce6bd1bf989914ee8a81cd4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/461] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From e9b631a79cccb5c8eae373552418dfb6642b38fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/461] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From ca770b2415927c589178f6c3c378d371d810054a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 103/461] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 05bb3ad7589fa259c380569d577b15be4a9e41dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 104/461] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 1fc454c6be14734edcd7b39c6f8ffe3ee62a3127 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/461] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1949325b42e734cc3b117879637b2be6ce9c13e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/461] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 722c94b0bde26b39e6dce6cd3fc994d412c26d70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/461] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 667d332d1ba9de12ae223d46fdd5174131c8f311 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 108/461] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 171495612e41a05b665da8a7027cd32ca1f50ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 109/461] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From a688c7e16051ffd5c5c69318ea6f78cf04145148 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/461] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 977776acff9f6e5443ba4190b44026313d869d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/461] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From f9c36c90cc03fa6f496a3868a67a64855813f070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 112/461] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 3f3729d79bdbc3b6fd9bc4fa569b2a7bc7978868 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 113/461] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From bb991a6b96dccf97ebefdff31c0f3a93ec816eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/461] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 70f5d91c580039543bdc202da7a7734df54f9c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/461] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4676d0751691b1297f95b7b881dd14759555f7a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/461] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 6bf06bedacfc0f9e95107300f9b01effdb196b22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 117/461] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 69b817d3f06eb57a3872cb385ff24f4ed02e524b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 118/461] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From e36fc5991a1605cb01bd19c781bc75c3f2a903e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/461] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 8dfdba849ecd7650cd5ef21380df806991f72549 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/461] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From ccdabaa7a45b72b354a383afa7aebb39a3f41940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/461] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 78e84e2902f8e4a2265a1b264e453f257f6f817d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 122/461] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d7eec65a8f4e8ef47c4277e4d464b8326b22daa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 123/461] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 4e7bb26eb82e230426c16f64e5fdce329fe9db18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/461] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bb04355c1bd83d06d4456197f11e820c4eb58f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/461] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 3b692a8b771a81c9ab79b9e341fd8e80f0aca09f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/461] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 6bcea7990dde33fc718d59d5c902da7794d104bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 127/461] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 299e05b092c26101c708943bfc3bef749ab5163e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 128/461] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 6cff3b52751a5adc2f3458e3f4f6078d1e3300aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/461] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 2d28362fc5fbd20d37e0a5dcf9c3b505d01e2aca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/461] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 68e92c56da229b8567df7f4df9b3dc4489753897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 131/461] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 1ff38c3d97e9147f5178664a27792d97a1c5eea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 132/461] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From d8ec25c405a390da5fb7f8e5573d065ac990da69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/461] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a5ed5785f1f08beeb599fb5ecb620ffaccc3e7cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/461] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From e1b06d6e99de365694e387531a9000e491e72096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 135/461] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e1e22f412dc346c1900aa12a0c39faa6a41d8974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 136/461] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From e6a48058f990af3750e55cf902180c03b2ea76e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/461] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 56eb2a1c652764cf8c443715756e0ebd96757045 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/461] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From b623559a499d7acb74dbc0022fb381db70d49eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/461] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a642a6d39cad63d813b2cc5e32518eee13e6698b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 140/461] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 7539c7d96404ed40bbd5aa6cedc7198d65486d3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 141/461] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From a1e09088ea938b902d65af16eb3fa253d9ef4690 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/461] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 381fbaa95b7b099f3b819a853795a061abb5248e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 143/461] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 83eb4d2fc25a53661d8b3041764e6df369d0c3c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 144/461] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 728362d78eb5c2b106f608a8c32f48ffa66178aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/461] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From c3ee14ee3fd3705664a78b9f172a0a0150460d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/461] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From cf8d68c3b5037ed53a8b967168b64213bce2a3a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/461] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d0c88ab0fc0bd5d368e16152462b606048890496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 148/461] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From e75d5c7fd26b01c549f8ade170588ec46dc9fdfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 149/461] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From fd7f5210712914477d4c2334d9043f73ed9be17c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/461] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 78da582365d2724927401cbb0bcc79961d718080 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/461] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eecd21505127ab97803accc885a22c462dfec4d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/461] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3f94bdd4c46bdb93c9c429ca7ceb663fac4de26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 153/461] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 7647e06e27873bd90d243462b81b22af03e5c1ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 154/461] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From bd3d8a4726ea1592791106bfb3c80d5e2b161401 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/461] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 54fe7366376fc01aef7371424a6d00593ab9a110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/461] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 4557cb3b6d52f88beabcd94b0c1dfc7857d9e4ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/461] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0144b5c0e79be19f80ca5cae74dd26aebbd0af2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 158/461] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 8ed6149b8241b7ad1cfe8fb5a615cbe9a8614ae1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 159/461] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 4bd37aa5d94bc065d5fc6066b0f97b4ff7512349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/461] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From cd3dba2599b4a0d7ee423c32d9cba1155fde65fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/461] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d72b5377bea37af927e19371f1d214216e995a41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/461] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 6f0624e10e7b8ea53a1877ce6074592f6460d9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 163/461] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 943a56ef3c1fe873fbc1ffe40991e78e349d324b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 164/461] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From bf159e74739c85078719ac5d57eb0cdb92659eda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/461] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4bdaa82cf8bb1bc2239edc9fcaee0ac4ffdbd6b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/461] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From a0606bdadae401bae282e02c932cd2f0d19f0cbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/461] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From b38b7215e0087f59858cf36ba1abfbfe5fe891fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/461] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 5bc025314d24ea6e0fb05a916d7824edcb357b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/461] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 38d92fbfe26ba9153b236862f79e2365f6277eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/461] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 3a002aa2b858f9d9eb6ba8d1164166beebab4b2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/461] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From ff9a0e26c43c2c432a00e735b64e17a55d1fd323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/461] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From a153719d7c48e4f1a1d3ed9d4532bb834a10f852 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/461] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From b9a43d0f3b4e3bbc0b2ab4520c885d9df5e1076a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/461] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 767d22763090b2b2133b8cc154ac7d49ac3da7f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/461] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 7ecd2fa31dc73158b88b1407ba799168c61445ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/461] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From d6e5438bdead04b2349a3bf7b6502f22335d3be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/461] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 7ff600a5c9a45f9bf4a754b02b900e0b4b582127 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/461] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 825db38c26b164647d654f967978b049deeff883 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/461] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From b917dfe843d2ca17392a8a743752b83d36bb9b01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/461] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 099c5d84c26fd2365aec5c7fb3195c54773830d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/461] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 75be784c3ee66d104d528f7a07b696bfdd3e89ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/461] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 628beb710d3364df9dd905b92adb80b4f9c21786 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/461] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 407e7671ad5b9fceb4ef92a9bd8a9b85ddfb893d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/461] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 9e2f174fea9f7d3e80b3acee93d15f4bae5b4e93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/461] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1a5b9e6a05aef9e9ecd171537cb8d3d051f770d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/461] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 4cbd8e292eb2ab143fd5e3e09301efbd27fbe452 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/461] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 4a72df10d61c959e2fe044a3ca176d25aa67f0a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/461] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 81ac1740a4a5978a8b4683a034690dea644d92e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/461] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 9e3586529d520762392c321429f46e22b4a3c9bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/461] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From cb1cedaaf7b6f50ec4bcb4ec3aa98229b4e328fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/461] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 0a8d4167c5515f39e1b661f054ff1afd623743c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/461] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 488826ee91ae63d3884e50508b61814e0833786c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/461] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 2855c1dc7f1fa2ad127a32d1aa9bf8aba98c5497 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/461] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From b985d060c4972d433933ca9cb854ae3029f9f1db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/461] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 7bf28c8dfd45faee1806a15eccc17f7e80da0cdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/461] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 77f10bd0587dde80e695cbda7b5ce65e59a8e5da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/461] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 7d3696684f26d953a5a39aa6d348464613b1ee1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/461] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From ab7072d9539a15cb2c880d88c5277c3b7fb12373 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/461] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 75e1c8732071783f6d75f3dfb0c0abd373a0f9ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/461] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 2cd358bc23161b96e3ab720ff79a88314825b1b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/461] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 8de4cd73e94c011314bc9344a21b00efe44975a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/461] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 1ca3a4b58eb5ec4e4824b3e5cf00079f09b247be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/461] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 3554856b8127440c405cc87b0fb307ac2c4ad034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/461] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bab04fe7c458060e734ac2ba50b9b44c1dade22c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/461] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8f9c04be73cad3b33f9727b1c04ad2716f66aa4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/461] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 3c26c27fab1f9ef36ca8c609a2a8ac7ffdc2491b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/461] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 47fd30380bcfcd61d9b49da90e56025f5c754367 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/461] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 852aad4eb7be965f3af6d2120fb6f5b7d88f5f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/461] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 530f9fff4114251aa0eb3cade209fe82be2523e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/461] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 7564fb3d048d52e94b618d65d9697bbde7ca502d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/461] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From d55ee23cc7c0df10e3fe71301b11534dfd2f3758 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/461] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From b97713312f538b2f3afa582513b2ee69c8c59fd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/461] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c0a6a0eea1031d8eb46c012ce334115ae5ecda4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/461] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 17b18a4565b0476d51445fe2b4216a0c60742921 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/461] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 280d17f782bb58adb159a0e504885747af5d8013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/461] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From d9755d7edb5d2265b968e07497838d71aadebb20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/461] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From add7b326b6e03750a0e1efb9c8babc806dfcc810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/461] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a30ff760c27a5d4e82f070c0dc73177cfcede8ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/461] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 08f21a1e422626e1fb27d4a4993a8d646df21716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/461] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 73435f5777ae1bf9da2ad3ac5d9f7722e329b569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/461] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From b48f3579b434772421d721d2c31d47bb122300a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/461] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 2deb4542a30b131ee42bf1f76b25a9da1799554b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/461] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From e5b4fc963001490f157adff703a55f0d973865a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/461] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 03c0f5b24220ed57922ee9a61b80e34040fe7fce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/461] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From f5c9b1df287768dc41459cc8dcf4c6377887e4b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/461] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From eb7fd8a06fef365b6738f2edf74330dbda37f5d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/461] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 8dbc75150bf1966ad2bac2b3b154719b90d758c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/461] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From ddda7e370a4b697f68c07b2c82dab98888782155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/461] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c34cdc1554cf5d876b334301875cc5cd5f65e4d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/461] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From feb1e6703794f5f8b75097d0de518a955892e45b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/461] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ea5a30a8c8469ea0ea473bff4fb7891df246a339 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/461] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 9b089246e5f48501cac0058908d144e40b70cffa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/461] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From f786d49519385ae82329bd284f3405ad5ed590fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/461] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 4d3967d1a0f07f5402074314393d90d140fa00e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/461] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From d567b607479fc69b466c080b5888bc80b827ed37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/461] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From fb2be9338dea477f96d9daa6c1e6e4de08eca21e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/461] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 6d8a4160eda1f48aa8873b4b8e3a58ffbc0529f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 238/461] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From e67156bc87438475d89095d5b6a27a824b67f80c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/461] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 1c086656b1167faca8265ba142a42f8a595e4f74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/461] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 638319907886552005a79d9f0011b22f0e9c93cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/461] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 6e09ed36ac8402d7cbe1cf0b9325e8175412cd71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/461] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 49cce02b7e00d49bb8b4d760097db6e6c5293e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/461] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 2b195fbf375bb2df70e7e416e89f512b77c28ce5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/461] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 92bbe6e249751cdb2edee1e0529b72714a8543ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/461] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 9ac3d3f7ab735a6cd7ace08a8793cdda80c34739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/461] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From f367f4cddc6f76befa3213c3bba21cbae8b0de09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/461] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 1fa0c1037df720940961117a166179959f4a46af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/461] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 719e4d77daf5aae82b87be376e86a8fdd3ee721b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/461] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 1a399f0349bd2bb81fb3f54e12d5903e756cca2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/461] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From e856de9e17eb3d904e7a16eb0f6dce4f43a75a5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/461] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 3225c00765fa6c9037962bfea3299db5d4df3157 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/461] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From f807ba09c974cef030ed4348381b123d282c1074 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/461] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 719f00696ad6a7d3e52c871a5063948188e5a168 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/461] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 82555a6bc973ea80ccdc828540cfe3a8948bf469 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/461] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From e93278b20422a8612842cf192d8b5645f6f39617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/461] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 720e3f8f1a75677c2ea75fec6b6f5d0771013981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/461] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 3821ff0f69c1c02970514d4c5caa879bbfc93d03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/461] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 424532cde1e146cfaefac73fcd7edc62514ca4b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/461] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 1503f0449593a717c5c188e12a1d0aea685cf5a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/461] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From dc438af9771f623fef84c3b9153baea6648caf06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/461] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 32f258e834a44811da6d1fcb3c6f839b33d983ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/461] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 395c84d31c3206dba00fadc6c2e93d5eaa833555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/461] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 0b56a55f4badf56b7e4200464d5b1b83f9e47888 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/461] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 5513ce70b8a44646c266bb59312f6c10a03cc804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/461] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 8a1146de439b09ab65e89741c8fff26c5d791537 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/461] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 34a9498edc419ae2e5c504539249f7f2c0d43812 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/461] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From fc8d0e3668513a5eeefa066e72aa81a9ce9b81be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/461] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 03bfda6ea5e9d78e7c15c539f1442aec24355770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/461] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 3bd7dc8c1e51efda338716be8dc7ce715c3895c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/461] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 550317e4b15deb42030e1bc331bd7c03c0dee440 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/461] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From b7d605575b9f263eba49041c36af718705af23e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/461] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 0edb2720b6e85ee535bdff95bc1f2c3e5fee41ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/461] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 99437fd8aced2fb3dd247f21064f80ca783090ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/461] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 3e6a7a4a73dddf75e26d5de1008eba327b9bb351 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/461] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 8b5531ea5f554f439e206818d61b74de3cf9b5a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/461] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From abe97f72f03805cba7dbc92c1573d7a9c02d1e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/461] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fa998ec8c8a146a436d6ae947b3e06f843c344ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/461] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From e0fa767c3614fbcc7c342c4e72b4bfbfe5a8b77d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/461] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 6c3d44d57647b55644a45653e0d96f561be67396 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/461] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 68ec4e0030c438dc1b7e1f2b004a92bbb17ed744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/461] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From cc57069c1e12ed0cbdb49b5753239a762658bde6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/461] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 745602770bc427e4688da50db4f95f6a9377afc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/461] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 581d695c1f97b05617a074bbd40141c9755a212b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/461] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 25258781d510cfc4a818031939f9f00819836835 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/461] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 535e5a0dba5f61be5fa87de48eb8a1cb6f7f7b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/461] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 50619e01bd65a82054d2976d9b2af12ed8e22d56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/461] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 71b90b814dd2049e92bc7fe30535e1731d9156f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/461] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 2bad44624471c844276e455b3fe0d18a8dc4a89f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/461] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 85b657591b2b0dc90859b41820f7b5b17884e54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/461] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 11113015b1ac59c7d40270486a242fda2479c31b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/461] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 84a321a23739d8e35118334cd6c675e190fa3a71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/461] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 20415add498c617b7a0a0b2ee0a08f323933c032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/461] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 37ae42d66d9582dd6154d90a399589f4bebaba23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/461] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From db0f927023bb0946c7e1a781379605a5f05ad53e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/461] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 8d3370cbb51bbeec149b3694f41847b42c0a653f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/461] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 26aa40296c288f34892cb7c6f195338adb3a2988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/461] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 4c06b93285e24862d6ba4c978cd93e9259615f3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/461] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 489f4beef57d4990f69fb910bd1840cf660cd791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/461] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f8f41f807c1ce738e90f44a2965d30fecba161c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/461] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From bc255a3e6494f4e06f6961b3165433c6ec743bab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/461] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 409729d75205510f6612d17a1b04e3b3f8f2c276 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/461] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From c90b7fba850e2d1443807d1a8878c1261fe4df0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/461] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 48186704dfc22a8ce4bd34ab8ea92d49fd129063 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/461] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..c1112d0443e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 9f11158ccedc9218f4e14aa76ba87e3500a7960f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/461] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From c262523285f58575ee1bcec37f66a50fbba8f081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/461] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 8cc7a626a44b933ee935e8d80f1dad775ad3619e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/461] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 848fb77f2dd909399fa570853efb5e55845abf06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/461] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From db0383fb6e723c64069d6f9d5e8978ce6e3eb269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/461] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1cbfd399b5d4caed8bbdb71b24920b81b3a18bbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/461] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From a0aa8c8f0d4100530a8846a6bd2636133bdbf4be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/461] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 9059262b1a7060d28432e60a488143ffa9c09070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/461] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8472c36ee10205cd04f9c4b0be18c4559d532e27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/461] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 993b1bfd954478fe97f44c9d77e4c7fc6ecb1047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/461] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5647df29ffccce8107a79994d165f5e9d033ce73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/461] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From bf1c263c08c57fe06ff863b6e023170bdb4b36a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/461] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3a3cf1270facd02d994dea67a7024c54a6cb9119 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/461] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From c54f9b75acf4aa2cc900dae5bee370ff0fdb1a83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/461] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From a06d193ceb3d3a4b1c28b4c93cf68fb4ee786590 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/461] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 9ca8bd1b472d04b968dc6a6177fa4636a0bb2dd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/461] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From bc4ba29058c57b0d14f20fcc682df52ba6676b35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/461] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 42d3fdd00f2defa451dc9d0f675f6e56fe4db103 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/461] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 8c43678d1a125ec802fa133df7fcc628584a36c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/461] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 756177a13416c364e5e781689c084111546eafac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/461] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From bcb844bc38634ee6d55f77690ce1e7290473985a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/461] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 13b658f19c049fb8997111bb8255695d412168fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/461] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 74596cebdcd78899a18117c98414b03b545400bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/461] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From fb9303af5bee521712094e2244dfb102ca72c5e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/461] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From d27bf805ae0486fa37420b77e20c9f0c0b3607f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/461] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 280a57611125a36c07d01f301f96284be614d361 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/461] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 02c14a49ab83dc76de10dfd9d6ba82fa78d600d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/461] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 6833f547afc4ff3f19b76c66f84ec3298b6ef2f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/461] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 080b4b2956033ea335c008bc418a9158488d4532 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/461] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From b7151b1a56e25c65bfa1fe728c40ef6bc2820ade Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/461] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From d6301a090d0c8bfbe98e62339b05994d591c8cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/461] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From c91e037c4bdec8ba50b3004810ae30223ce4a9a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/461] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From d9defe70543efb8c28ab325b1dfac79971dd7468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/461] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 92d0afd4f1438744228747cce07125f41740eabf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/461] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 80f0e82ad6d60f7193721fe39ae48c806d80e0f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/461] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 91d9e23450819861f2c04ce476c67bf57cea25d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/461] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 2f47bcbc733a716a00e7ade386854d426cb7be68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/461] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 2ed96087f5e1523c1356f68440322eba6305c11c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/461] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 5f8668f441ae5441b86dd74e0096f2598fb8e020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/461] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 02a29b331ff1b8d7e525ddfcb6a0e28580d71a81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/461] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 211c998d4b1397d65f18955e46e60aa6c0cc9f78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/461] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 08057b0300415b2ff6a68ef15a2cdd1467bfe570 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/461] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 97423213f0f58e3a94594ce08ef14dc65b1d7d7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/461] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From fee47e32e0a440bd130858a1192ee12051f1cd2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/461] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From c0e6ce5e2d48834c33088c93318293f47691f88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/461] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 79b64730e5d34664ca8fb3e1bf97f3441e334524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/461] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From df70c6d329fda952902f2fde1ba8e33852ffd8fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/461] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From e64bc04815774f77fb574552ff1f5a226ba23ab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/461] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From d0ecbc36a180f2d5b4988010b548099c37626bce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/461] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 2496aa7f513fab92486c06c0608693c894a3c47e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/461] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From ee35a304dfff82d7da8bfd1723c360280c3b2812 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 355/461] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2b43ca9a4af32a72d545428a2ddb8159ce94c36a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 356/461] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 4034db2c7de21107ca6191d6998f7b9d77f26b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/461] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 569a6d46151512d0d5be409dfedb634fab0ce73d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/461] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..bf65dc7277b 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 743acbd4b6173562009a4a62b3371b2b9dd71328 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/461] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 118520972268423ecd61ae0966b13abb366c100e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/461] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 944b31be279ab1e9034db2a0ab496025cafad2ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/461] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..e2fb62b08d8 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 509b110a6dd81fc46969e47d3b121a61f159bb54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/461] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 0573719782013573d17444a78b1c4ad2c1d94075 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/461] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From b767c5527d73ab2f01d66c5eb9b1615e3f9ff8ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/461] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 1d55d683cbadb117d49c79a74185e926531c6c04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/461] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 06056d2fca4e0185d7c8a856e65bb8984ceeef9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/461] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 147f1b51a35778b60367042b8093a34bee57b6c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/461] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From a200f383689cd535dff034560f6c80bd343719e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/461] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 3636ac8428e6f7593287a9d23326ab7cea89308a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/461] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 82ad3fec9b347fddb213c79a7a19cc9656a0bede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/461] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 5f80bd5367d3e14f75a7dbe141249d54c6902db3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/461] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 5691601db59b559d86071b9b9b4cab53657eceaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/461] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From f6736dd895bdbf0f2bee46fd5383881ecc4e548a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/461] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From e5ebb06b11a2fc7e0c93b293c796d1de309b8c7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/461] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 26e394448ce30b854a8252cccd76394e51dd4faf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 375/461] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 76350e409c0f494bcae6e9b980d193db57060e70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 376/461] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 1b9e0b8bbca8158b7b45f558654ca9291eebd0cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/461] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From ac788f388fcbbdf9d7b6b5d584775bd8dd10eaad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/461] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From 1ee407cf24da3f058059c30c24ccb91309019766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/461] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ac530589c4765c61b7256f6cc595f17e537a1cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/461] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From c7f4048771874128a97411d018d28cc984b437b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/461] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 225bbf7d24839dd0849b34bbf3ddbc794ac8e817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/461] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 11707ae35d45205b0e92e27117bbb36a2ddc0f02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/461] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 11ce4646a4371bf64f57b1057e37bc7e1ccce2e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/461] next: rebuild against OpenSSL

---
 srcpkgs/next/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 8d0ac8b8ccfcdef01ad2600276b5ba6a36685a3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/461] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 0302a0b52023816caf55797512d5330f2fc8380c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/461] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From d9b5ff52cfdbe1154c0f85e01e8d0e4b89e1e388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/461] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 4d355c028ec8ec35975ebe9af006e893d45dbd07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/461] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From de54e07c236c3be1db7c087f1582ea325aef3b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/461] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 26b196cbf21d989febdf6e86d7c5da03d553f8cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/461] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 64f3e54e0cfbab56aaa9784a9a5c2bc5a4d51f5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/461] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 4be24c40d484b7516d996da4a0b71d34a17a9204 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/461] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 68c8d338fa83e8c47f667c61ebcb7cfed959f726 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/461] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From f4e63b4c84794b347426368f5826fa2fe6b82fb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/461] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 756101c3b05705368d3d05b141a6583235a80255 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/461] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From df53c3ebe2a98f0876364d19363f0ae58517ff44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/461] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7e1b4920a4d419f3a0b1015727a760cbd27fe5b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/461] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2acddca5bffa836e92f1f6e64e92a09cc1558663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/461] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From adbf900424e7d17456d4d7792514b22a0876278d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/461] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c6bd2ad5bf4ff440035829a4dcd78c40420f5b73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/461] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 3a83645023eb6c246cf2a2b8cdd3345354d7affb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/461] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 051fff9f8952621041dc58e209628db93414ec69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/461] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 053bc4a4eeca55120f3c2f60f8bff80eb51f9fce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 403/461] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 5f747777a70962c249a427c164d4faa0f4ea2cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 404/461] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From aa02b3d0f2014dfcf8af37bafdd705db61fa88f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 405/461] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From ec19783a731c8935a035a3ea905fdc47e11fdbb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 406/461] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 83c3845daddd465e712b4d5e090dc60db392fa32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 407/461] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 67ef64028ba60ab2ce7a28ca3c3d7c90e8e30448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 408/461] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 7d1e3005dab2a54a7cfc8a886caaf30a09c7b675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 409/461] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From e13b2b1b6f279e84602547b408031d756e75f46d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 410/461] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 259d3cc9a93e709455bfb51c2ff7e323ba786fe0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 411/461] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 0a740b2869088f3a2eeeb4cde7f02d0a005748ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 412/461] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 575da9758c2d8e2636be682ac9f30938ec163037 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 413/461] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 8a9af27f6897075c32e9dd79daad29238484a192 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 414/461] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From da4f84b65ba4756072d4267b6fa9cfc69ef541dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 415/461] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 63fed1cc6fad563b57667e084c78d0ced8a70fe0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 416/461] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From cf065b2676645b18fd7a60fb4dd6effaf8c19676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 417/461] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From ac309921d7ee4efff4bf4a2031bd730bc0097bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 418/461] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 6954cdc33e712034af51f5e549506bcd4e25ce83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 419/461] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From c04867bc6eb736455f859e742ea7525bedad396d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 420/461] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 905a991d5cefb9775e7c9129157f152acf31ebd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/461] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 2796fb0a1ab1aa011e67b51727cb05aa6a68adfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 422/461] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 15025b31dc71da59f438bffba50ae654899fd7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/461] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 709fd26f825ae402031de711932794a291f37701 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 424/461] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 52ff6f28da76077681df9c1fd96782797c1014f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/461] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 2448f7113bc2c51e088265d099c2ec4abbfcf18d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 426/461] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 5972b004bc2d84e7661ed21fbaec4e066ca032e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/461] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From a10f86f15da29b1855b7e16bca65d0d0ee83f231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/461] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From c10865f6e746c5d4c39ce37a4a31075ae83c0cae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/461] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From d27a1463dc292323221b881c772ec96b13eebb6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 430/461] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From d4d92d694ef2d8768cfff2182c089124c8c5572c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/461] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From f5566d5b7b0e2f69f15eb25d0630a0cd404019ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 432/461] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 4ef6a5039248c081d2a5882823b1acf97d3d9f7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/461] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 823cfb2647ac6ee8e1d021f16985c097e8d525d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/461] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 6f9db6c482e05793c5c69deee8eddf35597ad9f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 435/461] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 2e0fae50c9105a27095bc7a444509d92263d46da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/461] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 29db3576edb46c3b39772d9184d2a33c31bf6851 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/461] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From fdbf7d2fa09feed74a4501f26ad8fb9d56b2e7d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/461] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From eff0b5336c0a46eff71ce8f7aba3c00f0f6084b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 439/461] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 1ab0daf6c03db62b38f32abf696606dbeba76a3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 440/461] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From d1fc9813cb0b079c2d58ab2a705226dcfaa4b39c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/461] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From f4be14774b48dfd39bcd72a7c18e16b3e969889d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 442/461] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From afb39b036affd848c37340804187d9113b6145bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 443/461] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 3b276159c66c16627802a554ae6ef7ea67b1faeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 444/461] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 7a131f63bb8ad161d8e18d2e12f52f2f8de85d30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/461] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b7b2e7a4c8afe2170914dca49f260f18b7c458a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/461] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 44d7ac9227537e1f3bd5ec588159a28895e7bfd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/461] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 4f079f90271bebfef1d0427db5dc744ef00a17f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 448/461] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From bd721d288b3c66dc9516f47aa284f88e6dbff0f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 449/461] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 73dde9284a6..badd95d4d40 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From dae2bcff59e3c388507a0048140ec3198c90a1a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 450/461] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From c6103de737290b0a5abcbc755b4bb84dc0602a65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 451/461] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 373fd0789c110e736b2ad2e36fd1ae1edba0ac19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 452/461] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 77a0c7913bbbc7a9c8a2a230a1da34c0a5fddcdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 453/461] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 977d039b5fef554c1c2538148ed4c130c8179f4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 454/461] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 59eb8a722148b10d3a44bd04090241ed3b55b9f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 455/461] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From b239050266517d1346acbee5e775a849d8e0a09f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 456/461] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From c626bd2cfa038ae07edfe84b182c62f9001e6b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/461] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b0d83714ad0..74958fa598b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.177
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 150b51d40ea8074580045540c65504dd050254f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/461] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6b37aa21b44..15338123238 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.19
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5681cb1e89b71b8c7c3d96296837dba3016fb13f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 459/461] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index ae1a202938c..16f328c45e5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.101
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2ce38dbcd26b4b51b2d6e5e31b0fc9791a4b7dbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 460/461] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e4..0ff0fdd4706 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From aff2eb1d679a1e64ba5071a0f84f67f49688c38d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 09:10:55 +0100
Subject: [PATCH 461/461] sbcl: revert to 2.0.11

This reverts commit e1632b85621c1cd6128a8e659ef2e4a148dbff5e.
---
 srcpkgs/sbcl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 67b3e5f34a5..739ddddacee 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,7 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.2
+reverts="2.1.1_1 2.1.0_1 2.1.2_1"
+version=2.0.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +13,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=b7710550939855ed49598c4a014483ed120b6991658a2a3b6afa47713dce4c0b
+checksum=87d2aa53cef092119a1c8b2f3de48d209375a674c3b60e08596838013bd7971d
 nocross=yes
 nopie=yes
 
@@ -20,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 5312b826a65b07df1d59370bd52a753269c8d703b4f482e6a8dbb7986599be46"
+	checksum+=" b7e61bc6b8d238f8878e660bc0635e99c2ea1255bfd6153d702fe9a00f8138fd"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 665029 bytes --]

From 949cafe3e7c966b01db8dac9d6b5318ccc527215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/540] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From a3a251041c50924e3bb453310c9714788ca89f6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 002/540] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..fdd5986a740 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 47473788f51a6e447b58aefc39ab588c20d3a44a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 003/540] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..95c48dbe8cd 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3cd9b5a63ba8cf6bf711b7107ccedd21ca065eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 004/540] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..f62a206c1fd 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 2c7e44ee0e8d0656b05a9172a11fc7fa644a4638 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 005/540] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..b394a98c10b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From d713d42f0686dd108754dbc50534313c3b5871b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 006/540] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index c836cc1a377..dff7be03a35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 4cd91b4d61e9f0f05e5e7fefc04f48996c4e37d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 007/540] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From c71567b39ac69a2bef3ed37fc08a5558edc9e030 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 008/540] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 622fc1675e9199c6820f131e43482ba052c5de36 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 009/540] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 0ddf4bac37e4fcd451510f9fb2859af85bb87067 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 010/540] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 76641e4917635775780e40ba2b988238585e040d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 011/540] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 17a5061e677a3b7fdc4afaec75d01358d0127e49 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 012/540] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index dff7be03a35..305041c8e5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From fd3c71ba8110330da039a8238b5552998f4cd47a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 013/540] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 305041c8e5a..5bdb4175c62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 042999f19bef35e258f308481f0e84d1b3dd9ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 014/540] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..854e76a613c 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From e968a8133143b633f91633bded854c2ac4fbe562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 015/540] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From fd7585dbdd667f183c24482c136f8109e51338a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 016/540] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From c99bc5cc4b545fa7ac0b2a200870340927079df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/540] MEGAsdk: rebuild against OpenSSL

---
 srcpkgs/MEGAsdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 7be92ddc65cf223870bf57543f4965a79ea68267 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/540] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From d7b2545158b2d508d601061a3d92996f4c126f93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 019/540] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 4577150b03f87a8df07dbe48fbf28fedc8892326 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 020/540] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 629fb33081434482dba6beb1504f23b6e98132c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/540] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From e12778695b10e8eff3c73899a43ff811a575b1e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/540] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 1d11ff9d967d80c5a2ab196b7660bc91b0f32a07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 023/540] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From af9487180798e3dd6848355ee9f88c77cee1f740 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 024/540] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 430ba7ea188b7dbc88e61e35fc0452a0c838620d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/540] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 1d617b48e4a775b45e4c6c3cb1afd133a74707cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 026/540] apr-util: rebuild against OpenSSL

---
 srcpkgs/apr-util/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From aaea62f35018cbfaba29d900afc17336b438ddbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 027/540] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a8d8e452d85a832aa13ecda9f070c5d9f95d8a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/540] aria2: rebuild against OpenSSL

---
 srcpkgs/aria2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From e5ff99f7ad891f42e0c956127a8c7fdcc9c14d02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/540] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From dcb1f07317f40934f4fc07cbe6d3614700cbe853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/540] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From d523faec876f4d22eccc6d978b8e6218be15b1aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 031/540] bacula-common: rebuild against OpenSSL

---
 srcpkgs/bacula-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 2c4aefbf542c97a3cff071157ba220875c21c50a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 032/540] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 29046fbd593b1fcf57f250d8e172fab7f7a382b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/540] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 52af7433d92f77f9409275a8179535f2f47979d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/540] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From bbfaddb3bd455c45511cb2c01cdbc2e7baee4859 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/540] bind: rebuild against OpenSSL

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From e0cb40661147055826777dcef9d9a08f2628515c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 036/540] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From d34d612c42427933546c2f8ec86b889c608124a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 037/540] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From af557eccee467a82351955fe7a31bcdaaa3912ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/540] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 84ce9e180ae48e5d6d42cf6badea6303f71e7660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/540] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From fed7baa40b276922183dd215db6d73f637e6428d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 040/540] botan: rebuild against OpenSSL

---
 srcpkgs/botan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From e965b5ac335b530465ba6b5d78ece4d540602539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 041/540] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 3ea2b636aab0d44514e998c4ff0d9df39ec640e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/540] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From dfe35fde1852c2e892e9ede7fc42259720539981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 043/540] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From ac652b1b62563adc382b9810b70f289b3aa41238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 044/540] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 7b1793d8594f665b9f3abbfc5575506299e0b7d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/540] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 3252914424071532ecf1520baea1f8dd08f62288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/540] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From b5f0eb099489b67af1475e4115ddd27d6ce7ecbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/540] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From d675b2af34773e09d915a021db60616634478b11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 048/540] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 460665399689be64c2e1e4b85be271f5b0505f36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 049/540] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From d52a57f58b679867142145f343a0758e24bd8335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/540] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From c5e8813ada7248ff762652ed080e794b14208dd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/540] cbang: rebuild against OpenSSL

---
 srcpkgs/cbang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 5a3bdb511958fb961bb69740bf857a9d4ba8e622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 052/540] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From ff8d8a05baa94c7e9b14c23cfea04c0635f6598a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 053/540] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From d5e6c07ee1598ff8072a422c0e2f451b13167ed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/540] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 540cea33d1269e29faf800dd0f25b186b8ae2499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 055/540] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 2c483c4346c7feeecdf13cfd1800bc0b0e5309fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 056/540] collectd: rebuild against OpenSSL

---
 srcpkgs/collectd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From 3687908bfcd6ac35ca30b7714f38b031b33ab2bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/540] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 4acdbd08c9de816f98e85162d1f893f1482b1ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/540] cryptsetup: rebuild against OpenSSL

---
 srcpkgs/cryptsetup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From 9789aa23a49aa8c8357211bc2f1a3a8e6b765987 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/540] curl: rebuild against OpenSSL

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 135e2c49c4ebb2b395e7a7f28d08cefc436af5d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 060/540] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 170f8cfabbf3a35f94635170ea9eb208d1a95407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 061/540] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From c26aefca002f20e7534b9dddeaf7b9e9a6e24633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/540] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 6e784f13c92e3c860310008d08145c430189f8a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/540] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 38c29d5c35ac28f7fd2a1e2b806c6910aa44b04f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/540] dovecot: rebuild against OpenSSL

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 50722b6eaa89700fc033ed77a6c17ce4bb4ef7ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 065/540] dpdk: rebuild against OpenSSL

---
 srcpkgs/dpdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 6c81cc287b8e951b6c4aec5d2c4fc991bd5b49e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 066/540] ecryptfs-utils: rebuild against OpenSSL

---
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From d41cbde9f5b050c9e26c52ca0bd673d34e590247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/540] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 93a2ba291c5b419f8dfa9be017f9a44422943c6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/540] efl: rebuild against OpenSSL

---
 srcpkgs/efl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 15ce6b11b2cc24ab03e5c056d4632deed156805d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/540] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 087008c3faf484dda95965a05e42bc22658b6bb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 070/540] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 19c6e6f86159ae00f43def5b414b7050c6daad99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 071/540] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 725dff1a180f48d7692cec2754a72d57e8305099 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/540] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 039c5aeb5b8f82f4ee5bb8de0f10078543f99d38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/540] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From b2976f448c93aabb2628da09e79bf69e8af3bbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/540] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 4577951c806a1ce6b035ca17d94f9f51e6074858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 075/540] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ea07f0b946c03334763909af466b9cbc473e3486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 076/540] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 217e20217c2264194b02ce83da5ccb0c75a3294a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/540] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From a1b609da77e1ba94b2efdf1285b36232eee7d659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/540] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From ff991b8aaefc0a40df4deb66e82c255f7bba8348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/540] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 305637af6c634ed6287a4c3538e456f097a4a4ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 080/540] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From e7eef914f974e786df3f79b9aa49829f4585ca6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 081/540] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 67fc8e5b32971575a460d14bfbbf52adf6667133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/540] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ccef077c06afc6a2e58d6d65bae9f61bfe4c5dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/540] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From b10c7b82c8f5826cd4603dfad148c734e9ee5097 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/540] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From f76f420966db2a54ad34a7611f04af8b510f79d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 085/540] freerdp: rebuild against OpenSSL

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 86ec3767770e1fee77249feb99d80aa96d04aa14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 086/540] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 81ff889be93187a7805783f5675d22fec38c31d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/540] gambit: rebuild against OpenSSL

---
 srcpkgs/gambit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 366e23523a43c033db139f6e8c57aba1e06f0a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/540] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From ef8aa7377a23dfd8fe71dfae2bcf8e8b3006dd31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 089/540] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 4eec027d5cfb29e2ae4940b3b0adac21dc3dfcc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 090/540] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 62cc28bf3970366e7850c6ff5f668bcd220ee2b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/540] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From ab0563aabc0fa17fe58e33174cb35717207ed340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/540] getdns: rebuild against OpenSSL

---
 srcpkgs/getdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 8990b083188d2d05f935667045e98a97a9fc6eed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/540] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From f12ea24c2f160dd8eb5f35db765107828024d6f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 094/540] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 69e1dad7cfd187bb36381ff69f8d4c1ab58c049c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 095/540] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From b90b94e873c333152b3f73aad4c403d5f3f65516 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/540] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From cbcf158dad9348ddc830646701097f877e09e2dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/540] glusterfs: rebuild against OpenSSL

---
 srcpkgs/glusterfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 2123facc60f80a9025bb3084a33915b52ff1fbfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 098/540] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 48ba8202aa39c8249ded771f81d6d0838f4c6057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 099/540] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From d63772f0e96290b0c69588ad729a5c76457f7bd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/540] grpc: rebuild against OpenSSL

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..20fdf667fa6 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From ece46f3d5079bf8d3a45828a0030e08d5b9c47bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/540] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From d6a0a4cb87aa520ceecfce2f0514fbe205c8e6a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/540] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From c391220c8a4999f63734239df0b3cc949eefd0ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 103/540] gst-plugins-bad1: rebuild against OpenSSL

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 3be8a119bb586223cf88fd202be0080fae24497d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 104/540] gwenhywfar: rebuild against OpenSSL

---
 srcpkgs/gwenhywfar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 8b432ed207ca784f16554f55ab5134399f9929ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/540] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d452bbc2fec437e817e60b269c863cf5599b69a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/540] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 4a0aeb834a67d1396d9a67e027d0d251aa106b99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/540] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 947f85ef388cdfe209716ab379a08209af81018b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 108/540] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 1307f156c4d01d66822a238f1497b618e4ebb654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 109/540] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From ab26d863df093494a1aacd9afa43243500e7ce7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/540] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From f0d4b5d3074715eaa8ad44b612ea7d010b06b25e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/540] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 73afabbab7b1984b6b776f4522339517122c2cb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 112/540] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 1310a7be5b31d2470e126b2a2acf5fe89f610ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 113/540] httrack: rebuild against OpenSSL

---
 srcpkgs/httrack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 5d84d0fbc27b4ddd7f4c857808b19c37c4ff6a06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/540] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From e2b2d5dca50f50d70ad40ca9fccef19e7d71c3fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/540] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 61d41e6e5bcd89f1420c5afe8079265a163d4f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/540] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From ec59fdc4a0d7997050d7a3d1ec5f3c6b419b4c41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 117/540] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From f518efb1f86e7a404d24d6f1e3143d9224674016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 118/540] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 45feb58b9fedd84aecaf324910b6c59fdc4240f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/540] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From b248ba018bed957f8fb55b2ab01b1cb7bd07647e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/540] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From f2c3deebed348462995363e8f83b5a7411a7ef07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/540] ipmiutil: rebuild against OpenSSL

---
 srcpkgs/ipmiutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From b525fe71c6d0d576c81aca4df5396eac3cf1e773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 122/540] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From fbf9031ff414fd1df663210e3b63ca024386f948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 123/540] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 5d521a611f9257b523ba404a6ec6065e9b66cce2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/540] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e05af4537af1003471691e7e1cd78bac47c8f6dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/540] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 83189ebb1bf7b91e3fcc28333fd9e742e305cb27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/540] kea: change botan build-option to use OpenSSL

---
 srcpkgs/kea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From dbb2abde46a5602bcfaec618f53114c495de6d7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 127/540] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From ffad2e07f5047591fd9ad120abc9b122205f7177 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 128/540] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From f4551e5b08be0e836e8c1aef328911b4eacdea08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/540] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 41e4560275609b608210ca83e964fb28736768c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/540] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 596fec8939b25fee83f0134c205f47c5ad3f2811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 131/540] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 36a7623164113f9b647c598f54c460e3306387e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 132/540] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 33770840ea19ada70d27ecc56c18216b2276268d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/540] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e5a90cdbe424aa4414d2fc174271bc42cd3bf4aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/540] ldns: rebuild against OpenSSL

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 60b4bae43814564f299dff768ac8caca43774e03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 135/540] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 80764f796bc12ebf1ef52c25f29c6a20f4527bc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 136/540] libarchive: rebuild against OpenSSL

---
 srcpkgs/libarchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 761653c96080e010ac5ddb6eb549f8b3a0f9d897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/540] libesmtp: rebuild against OpenSSL

---
 srcpkgs/libesmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 71c75bdbb4389427920d6c54ed46fc1e650e2d67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/540] libetpan: rebuild against OpenSSL

---
 srcpkgs/libetpan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From bef0bd0cf0cf6575f778081d34b575f5880362b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/540] libevent: rebuild against OpenSSL

---
 srcpkgs/libevent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 093f9476918cae87be3f9062faee1659e0a129bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 140/540] libfetch: rebuild against OpenSSL

---
 srcpkgs/libfetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8738fe2f483fb143501cb76eab495c7c60cc681a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 141/540] libfido2: rebuild against OpenSSL

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 88d3743bed673d96c3cd861a272e31dead32769b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/540] libgda: rebuild against OpenSSL

---
 srcpkgs/libgda/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From a84cf928a118a39d27d4b1c9c8343e26b492b9cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 143/540] libgit2: rebuild against OpenSSL

---
 srcpkgs/libgit2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From f08dceec33e8644883256a7721504eeeac039ab7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 144/540] libimobiledevice: rebuild against OpenSSL

---
 srcpkgs/libimobiledevice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f9f82b39787bf4ad966396d6930368428604694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/540] libircclient: rebuild against OpenSSL

---
 srcpkgs/libircclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 0878d9204a49024aeb1f342072ee51843b2b387d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/540] libknet1: rebuild against OpenSSL

---
 srcpkgs/libknet1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From ff9aace40fdbd448dc2cd86e93b87cd670de93dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/540] libmowgli: rebuild against OpenSSL

---
 srcpkgs/libmowgli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From faf938334188edbaaf4176088498ff61ff328f7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 148/540] libnice: rebuild against OpenSSL

---
 srcpkgs/libnice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 134ba30c6bac3d41efd64bdb62f66f55797e76d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 149/540] libostree: rebuild against OpenSSL

---
 srcpkgs/libostree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 37b3c02fda90890da207054dd79cbd661e7c6bb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/540] librdkafka: rebuild against OpenSSL

---
 srcpkgs/librdkafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 06c096b167d8ccb4711676534b133e2ece173b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/540] libssh: rebuild against OpenSSL

---
 srcpkgs/libssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ecc6503e77d862cd49bc5028fe179b5405f15bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/540] libssh2: rebuild against OpenSSL

---
 srcpkgs/libssh2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3fd1226eb3411598f50422bd56f8bcb0714130ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 153/540] libstrophe: rebuild against OpenSSL

---
 srcpkgs/libstrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From f3356878e5725640aae4b8018152b596b980174c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 154/540] libtd: rebuild against OpenSSL

---
 srcpkgs/libtd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 34867b55c085cced517eacecdc06b061ebdb2ea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/540] libtorrent: rebuild against OpenSSL

---
 srcpkgs/libtorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 4ff2c3b05e2963d81dd02bd7539ff1ac964c76d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/540] libtorrent-rasterbar: rebuild against OpenSSL

---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 1a43db12e9de2f3e9ac03381ed658233a7e47410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/540] libu2f-host: rebuild against OpenSSL

---
 srcpkgs/libu2f-host/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ffeecdc5c3a7b3d908955629c2baca6078aa06de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 158/540] libu2f-server: rebuild against OpenSSL

---
 srcpkgs/libu2f-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 0e7f96ef943439dbc1bd1faee3433f2891aa038f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 159/540] libucl: rebuild against OpenSSL

---
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 5b7c544b2d079da053b6f642bc24e2c58cca6d7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/540] libwebsockets: rebuild against OpenSSL

---
 srcpkgs/libwebsockets/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From e4384a9426559ae50ebd82672f48b7725a62282e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/540] libzip: rebuild against OpenSSL

---
 srcpkgs/libzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From ae45649c981001e5df242ce560b470eac604c266 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/540] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From b19d609579acf97e6ef9ddd3ced951d91fe85f85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 163/540] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From b524f3fea7ca2ed9d393786e4b94ca39fc50c44a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 164/540] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From fe6ec4771c0bdec313974e81dbe432bb05d8a471 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/540] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4a26bb1824689d42f7ae8f87540bf1648e3ce586 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/540] live555: rebuild against OpenSSL

---
 srcpkgs/live555/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From abb010d2abbe528df0bc424ee799ae794f988ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/540] loudmouth: rebuild against OpenSSL

---
 srcpkgs/loudmouth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a0dce1de5535133f064693238f4d9775209dafa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/540] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 38ae335083d3b55ea71a40dd2e6313e73e21c955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/540] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 3383aa781728da09cf7ca237df53c971e199e412 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/540] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From c6b1c2122c4d615a14facb45b707c6033b3b7666 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/540] mariadb: rebuild against OpenSSL

---
 srcpkgs/mariadb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 76f8fe6b45240c635ca43d0c0133ed519518024c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/540] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 116b0fb6949dcb57cc6f805a47e4a22892dc6483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/540] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 147c2b016dea6c1ced1a1fb432ee4ab92f52d30d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/540] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 773fc05bdebf7cb0305e15bd090885f95b9137c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/540] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 8384cc0c9b1296a6959ce1bd9ba5e3fd984f8dc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/540] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 9eb9b016e765d065e522f60be90b818d73367cff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/540] mit-krb5: rebuild against OpenSSL

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 8c9d02bec28a330427c367521185866aa7f1d92d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/540] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 4986ae0946201619690a80f78f7a6a76b0a07da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/540] mongo-c-driver: rebuild against OpenSSL

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From c2e24bfc1c53c1cdbafe4465a28d1589d0c8c3e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/540] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From ddb5a532e7cbbaa3aae97765a2d666f86968bf8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/540] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From de9a457fc50dc60585d048714385b7daa17ef283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/540] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 86fa33e685636d43004a5a1965c3d2f4986c7f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/540] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From c17c45b5eed3231b526f8a6ecbf76ef0c765f088 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/540] mosquitto: rebuild against OpenSSL

---
 srcpkgs/mosquitto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 298170a907400787feb233bcd44c84bc8b61e5cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/540] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 673ff22b2ec10da8594e69d03aeb896a6bd568da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/540] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 7bb8f5f84ec92d65fd408b019427dd4bf40d40f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/540] mtxclient: rebuild against OpenSSL

---
 srcpkgs/mtxclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 5b4f374249a3d0b0626e57fb4727b2470d83225e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/540] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From fa4c2a662e2783a12fa34cf6b54c9923c6ba7c55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/540] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From ec88d0c9de1cbf10ec0069823ee40bb5dc984780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/540] munge: rebuild against OpenSSL

---
 srcpkgs/munge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From f70085872092f615ae2253c7b8898f54ec5d8679 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/540] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 124eac6411f86633bf200ede86491edaae636e17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/540] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From c164c48e762c41f7b66e361d60d3060aa05bbcf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/540] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From b38b512c47d38228dbdb37ad790d894bb70d61a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/540] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 8e422c1dd5a25a5dc3b9d464dba24d9ff4b269ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/540] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From da8942d4469a06271642af3ca803da4ebdbfd30c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/540] neon: rebuild against OpenSSL

---
 srcpkgs/neon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d2b7b62029631e931cc36532c8596a9f8746c052 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/540] net-snmp: rebuild against OpenSSL

---
 srcpkgs/net-snmp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 1b5d626aacdb35e132f149c4eea89505042afbf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/540] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 1604a526f4be87c32bbbfd814f4f2e2746ace4e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/540] netpgp: rebuild against OpenSSL

---
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 3 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From c338240ea1db135cf8f3d1087002e9244a8e0f25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/540] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 3b335bdd954b123adbb470357fcbdf6ca17c14c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/540] network-ups-tools: rebuild against OpenSSL

---
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 2 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 4e57d7c31afe4b1432bf3267b55a67d24793b347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/540] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From daa545a154203ba17948deb2a840892d9c332362 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/540] nghttp2: rebuild against OpenSSL

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 53f15084f9d73d90620876a3a224f637537bcbc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/540] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c89299092dbf0030f1fc6f1c286495e38b087cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/540] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1c6135b99daef5d583d6edeb3759e62d8f44a3f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/540] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From 469770a9cc82746bf04b7cc607d2938aeb3b20f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/540] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From e3e2ea8be04b8cbd1660eb41abd68f3cb2f61c09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/540] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 57e7adfc7e039f7df2d5b03183d511958cf41b8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/540] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From eef0ff59a0b097d1f1e3855ad891d15d2136e183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/540] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 297f5c022f9d90efea2825342417d45eda226bdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/540] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 6676d7b9ca80f3ab3bdcf9f47068af5903928735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/540] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 03764f1fac2e95e55e132569dba158985f5ce897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/540] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From a0e8572e3c4d16bbca5026c2db85caa18d4d8994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/540] open-isns: rebuild against OpenSSL

---
 srcpkgs/open-isns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From e8ed2ca4a9f2fd7729ca5735a743e5e8e2a5cd0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/540] opendkim: rebuild against OpenSSL

---
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From cd38fdead01cc75a48da4f351ea2bc2cbdf871af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/540] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 4cf49f7f42ae85ad91a2b70fa0390ea308ffdc3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/540] openldap: rebuild against OpenSSL

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From a56705b95bbdc86c87fafc697e76b250471c0056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/540] opensc: rebuild against OpenSSL

---
 srcpkgs/opensc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 4641ee0f836c2abd74d67072c287963dc30ebbf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/540] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 0ac0407b9e4099d1f83756b65b1291063749fd17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/540] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 845731f009b7d19a6b6fa73f2580d70fe5b40f15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/540] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From d52eb59cd60812fd6ea6c6b10d63711aecaad0cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/540] opkg: rebuild against OpenSSL

---
 srcpkgs/opkg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From ae6ca112fffc7c07c66ee02abf95b1456bb66d2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/540] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 37ec013edaa482e1ff2ea84a01b4cebe80952fc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/540] opusfile: rebuild against OpenSSL

---
 srcpkgs/opusfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From e94d96c0d28261833e9716d9292f54d2cf3a0a2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/540] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 76db102cfa7a618c58744e475056c6edad43f01a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/540] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 3915cf69d3a7ab67f684a4c57f84929c852ef014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/540] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From ac7f4672c95a55f1891dc5002664c9b2438e0374 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/540] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From e27e8394504717b6c1c7c3f2665689a14ba665ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/540] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 47d1bb391b9b840ef1cc258710d1e43bbb90531b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/540] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 82c6100733515abed3f733ed0bdd983786e27a99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/540] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 56b6f4242a6a8443ac84545b5ea3c44a571974c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/540] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From e3e33619752496d4c867e51c675e50c994751b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/540] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From d6707ac357d8a810a11d6b0043fa00e0502335e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/540] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 855b1fc9fed39ccfac188b615168d53b529c07f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/540] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From ff34d5214914696a637e430d9607deab331549ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/540] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 5280753ac4b8464811b25db4f2241891c354a8d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/540] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 4e8d358567cbb8cdd4bd808030839db8f2bfa808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 238/540] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From f7a4440d547f725367c42da56b712eb94acbe7eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/540] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 9464f4d850943a6ce18c26537ea24015325fc17e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/540] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From ad6376e61533d03fa8dbc18bce1088ed9f3da956 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/540] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From acd8bf55569a590e82f8f213de6e1dfdbcf63cfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/540] pjproject: rebuild against OpenSSL

---
 srcpkgs/pjproject/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From b87bbde6706cfd1e6a64f69765d863948bf9e6ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/540] pkcs11-helper: rebuild against OpenSSL

---
 srcpkgs/pkcs11-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From fa59af847c026f2aa0c8b984497b1efe1c97120c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/540] poco: rebuild against OpenSSL

---
 srcpkgs/poco/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 3af1ea5023df11543c38605ff26a84006cde3557 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/540] podofo: rebuild against OpenSSL

---
 srcpkgs/podofo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 8fb581153a962b0a0348c2c7985af13c033f55f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/540] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 6f3b65d15e43c83d974de977357ba659bf43dc5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/540] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 59185dfe5d089b46a11a622cd7da64ca3b47bd4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/540] postgresql13: rebuild against OpenSSL

---
 srcpkgs/postgresql13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5092eb13c7795a99bdc7e5fcaaa54ece726098d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/540] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 7b49a047960b5fca0ecada992c31940725f8b5a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/540] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From c2a8f879eceabc915b77e232cfa6f4006b671868 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/540] pulseaudio: rebuild against OpenSSL

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From a7b9d17c68aa4309c83fa314d03eb107ab722e82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/540] python: rebuild against OpenSSL

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 670ad4d8707200b9a77e12b2cea62adc6998e245 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/540] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5b023f87cc1b9f1245311e0d3b7ae4884f18a022 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/540] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 1a621780a2f46a965466d0619c0694cb8040d785 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/540] python3: rebuild against OpenSSL

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From d696acf660c694f0310472b360d3a775d21cd026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/540] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 757c391a648674ad3b459a0ef100d2b9ecd1bd09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/540] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 09af481b2bd6083a65bab5a4df4fcc18ab9d2e46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/540] qca-qt5: rebuild against OpenSSL

---
 srcpkgs/qca-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From c281bcdf63b1dbb89e837bc71a20944a03fa0054 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/540] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From c1515aae0724e98d761456d114f8e67b7877a8a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/540] qt5: rebuild against OpenSSL

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 2 files changed, 4 insertions(+), 426 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 9d5ce190e510a760b08bfc9eab11113aefc1a636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/540] rabbitmq-c: rebuild against OpenSSL

---
 srcpkgs/rabbitmq-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 3ecfce8cd34ef7a942429eff8e14b16ba130c5a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/540] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 39f81962b4907cee6d798679c010b076fefbbd6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/540] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 3a8baa2adc5f1f7cde19d2e978fb64dd99ccd834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/540] re: rebuild against OpenSSL

---
 srcpkgs/re/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From ace8b0e88bf39cfc4509b54e2ed928b66c76a76c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/540] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From bc1e6555498343611a0b4fc679b7a3dd4b8dda86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/540] rhash: rebuild against OpenSSL

---
 srcpkgs/rhash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 3b91116d6514dfb3cb6f6c2b22a9c2dd994de15f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/540] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 67068c32308f466ec285b97027f1ff43b8efa1c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/540] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 27f2862a616c6312bcca2175dc5c36ae6ef9d75b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/540] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 226269115cae62293466100c6a0ea9be59ebe88b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/540] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From f32d71c9d5d621e4a1836684e8d6bcfe72982989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/540] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 79b143882703e797e962b867ed5a0e349362dd09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/540] rtmpdump: rebuild against OpenSSL

---
 srcpkgs/rtmpdump/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 0c0e86335de2d8c94de1dc9f6f0a331255967e8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/540] ruby: rebuild against OpenSSL

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From cc0a3b110d4f762c4ea21a3814536d2d4b51f1c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/540] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From e8698fed80743ce5b05fc484f972c80d1d72f4b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/540] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 45da56cebc1c63efa91bb0b6d27dce7db773782e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/540] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 917e16c94cce56485eb37a4d5e2d2a4f67f9f2d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/540] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 07d09bce3cce43ac81525405357024da5fe5634c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/540] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 2a76e260c228ba79159b2b86aaa7b63ec204ec6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/540] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From a53c0aebde2fbc7a56225c45750486bea1bbdfab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/540] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e72895500fc63a21e1677f679eae533f05cff3c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/540] seafile-libclient: rebuild against OpenSSL

---
 srcpkgs/seafile-libclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 1fabddbdc23245a60f3c3d5d60f83ea6d59ec3df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/540] serf: rebuild against OpenSSL

---
 srcpkgs/serf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 5b7f00305cdcd6bb1264aea824b401947948dc9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/540] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 7853c88cbbf674e9cc8dfe7dd968c74e56adf477 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/540] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 457e11d5bd25fbf4bebf7ffc4f96145156bbf88b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/540] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 827b4ffbbcf55ff5ea3e611c3d3fc4f4574fa707 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/540] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From f8342d33e6c836812e3d7c24656e605626841190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/540] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d50f4462d43e2c4719e3165c278948a306b974b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/540] spice: rebuild against OpenSSL

---
 srcpkgs/spice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From cfd3b88b02390d6dbe90cbc77d7b3118c00489bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/540] spice-gtk: rebuild against OpenSSL

---
 srcpkgs/spice-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 71d5d8590b52426c1e5ffec0f388729b970987cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/540] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ef8a394cd5f60e5b1e237d18f19f7a17bcb0494b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/540] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 8fc8c3bbe4657f4a942a5861d696a1607d3431ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/540] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From f302dabf05beabe0ccdab28a8e4f84b026bce013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/540] sqlcipher: rebuild against OpenSSL

---
 srcpkgs/sqlcipher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 5899991edec04b0959300fab3c49a5a54b58fc22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/540] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 0f4791382178df5322299569e1962760c69f65b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/540] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 119aeaacf9a879ab5ed654be95c5691854cc922e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/540] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From a38241d13ef2c66cad0bd9f5d1914ba2d857ce1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/540] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 18adcaf65c1600e675c454528bde993dc54ee2ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/540] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f35e0ee01d1f1ab7dc2c3bcb51d5566a5f856f82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/540] swi-prolog: rebuild against OpenSSL

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 5e2a93ac515cf4892c626d933c8cad4f3460f675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/540] swiften: rebuild against OpenSSL

---
 srcpkgs/swiften/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 4d0634fdeaae14adff6e042914d93d3d3af33c54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/540] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 808815ee87ece1ba711b20fb135cf056667d4873 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/540] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From b85166777f063970fbb6e6d8236c16e87616e21b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/540] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From b7f58da8f0f4364651b25eb091b78e69cb55f137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/540] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 8adbd2a5cd49ab285907de194859d05da5d023fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/540] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 37b644a73ef64d5a3702dfe125a51386652c3df6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/540] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 702ea6ef2620e6d22b4c9cd2c7480139a8a2f2fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/540] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 96242c29e818ec65ae771f4d92d8fab44dcee82e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/540] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 940dc82ea4effa5084c675bd4c8d5b74363a84a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/540] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 4a923e0477ce7320d6b01cd5e4c6c2f4ad5d6810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/540] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 59999d63d0c716fb63da99486c5167245f24a749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/540] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From a450af0c2098796be1f946987e26e66322ff7410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/540] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b63f7ff828c00a93e50c155fb0f88e76f80dd99f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/540] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 8d2f738501aad357e8a5c8c5d657163c3fbd75c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/540] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4dfb4b5895c3cfbc768acb4d346fbf9861eb02f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/540] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 0022edc3e579aeb116091ec3dde7c093122dec88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/540] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From d3441169cdebdf571ea14bb74a1a73dbf9b43fb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/540] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 151cbaf2b36612af8298ce76fb2c3df08ef51a57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/540] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 81f7e1301d5aaef2b6e69803de08d4fd3c286aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/540] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From a2f6c1e8dfe80d7757f7869f54c254fc0b40801f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/540] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 321dc4737846185e692ee2cc8830e1e005976ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/540] trousers: rebuild against OpenSSL

---
 srcpkgs/trousers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From daeaf6a8361d98659fa2027a5d1fe84b4b9312d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/540] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 59188389c945ec47a7d838e7976ccc105ff13a07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/540] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From fa6f3294af9bf6d5ed1bd80fb322adaad9b24601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/540] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 6cefe6f94a50e15c4491409b3758feb0733df4a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/540] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 5640252832faa4bd61cb52bf5eea0f971187d7e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/540] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From f5d7c4e9ad25c5e83de8bae5fa911bed444cef97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/540] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From a4bbb7d7f334ad87263756a42690af55df9feb66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/540] unbound: rebuild against OpenSSL

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From fd3dd660f968e4472fd690125ee1d22c41f1b2d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/540] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 9d87871687323b4478e20857c4eea61e82bb3b84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/540] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 78f9dda1891ae8bce422ad7a366597f78b5eee69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/540] vde2: rebuild against OpenSSL

---
 srcpkgs/vde2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From c304c33b633c86d9557ec278ff1db1cadcf46a09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/540] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From d1df19c5518138084c787190c14c5cd53c901447 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/540] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 7da7e3659c0180d0d7881ec8ef900e5b95e822fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/540] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 089d89c92f6b72b4104376e44dea18a832d4b8b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/540] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From e5b982197f6d6a643ffe6d1cc1c8c755efe2e801 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/540] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 291d307d2a9ae1cf849b81ca25b5475ec359a751 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/540] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 2adab84a95b38e6641ec2795c8e04de28570373b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/540] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 886cd836827554a079ce8ef6697c4b057880416e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/540] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From bc56803df4d7a2d07e68031588e0a663fa3b637a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/540] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From f0f613a58d8a3aff4cc0cbbd2c9e0cfe4468ecaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/540] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 67453122f0e8e533715e96dfee4788e98849e27f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/540] wvstreams: rebuild against OpenSSL

---
 srcpkgs/wvstreams/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 8a261f2a24f4bdca2ce945c1b4e8cd583033d179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/540] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 814054d700e839551c201540431703a700883dc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/540] xar: rebuild against OpenSSL

---
 srcpkgs/xar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 538fdcf8d60edc3518cd2c27e1b7f0229d7d1069 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/540] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From db60b76782ece3a21812e7cd8af0afa5f1a8a875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/540] xbps: rebuild against OpenSSL

---
 srcpkgs/xbps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From c9c90acf0a32d2be066fb83d132edfe019a05ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/540] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 2260e533b18421b3ced4d0cc0dd0c19d43f62656 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/540] xmlsec1: rebuild against OpenSSL

---
 srcpkgs/xmlsec1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 2da09994c78ae0dcd8a7d7e101ba1f55af154d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/540] yara: rebuild against OpenSSL

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 43184c657973602227b87941cb573c40e25d47e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/540] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From c7402cd8f88e0a414e50035972aeb3f71b1e5111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/540] yubico-piv-tool: rebuild against OpenSSL

---
 srcpkgs/yubico-piv-tool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 826ffb433b11d7303c53fe4d6efc5eceae1e4623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/540] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1c20eb6d1dab4f3525520482f32de054100e8ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/540] zchunk: rebuild against OpenSSL

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 32bb233a959d313fb4ab43c39f1292e465195f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/540] zeek: rebuild against OpenSSL

---
 srcpkgs/zeek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 049d2bd8df52deea4ee84b58a35e847f1167c98c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 355/540] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 16de673d371bcfa57b48aea04bc5b3bfefee42d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 356/540] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b22ecc421d8c3a353d1e341711217afa33a7e70c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/540] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 63c2d914ac0abb5089168ae927d0356054d66239 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/540] c-client: rebuild against OpenSSL

---
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..bf65dc7277b 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 15eb8b6bed448d47f18ea84c81f15d8523bb68ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/540] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 435217c7b9769f71d5e174f8952e0a037911b340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/540] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From aa8312d6ac7b2f9f26c965ea45c655a00e6396bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/540] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..e2fb62b08d8 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 656dcc3bd3efee7f437bedcd8d1b628e0549b0a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/540] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 9ff7af4d0b7b14609a07b64e38b4b43ea6dfeefc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/540] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From f3dea65aca4d3b8971c89ebca943859be7435f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/540] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 267cad59083feda9f406c9877cc908a016297859 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/540] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 0edeb138a6086c534c99f845064c9b4d967e77f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/540] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From e99f5d333688d27b6ae38a92820b29a272da6bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/540] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 4b916cf8f278d210514162cb41ae84b88b44b234 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/540] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 29fbd2fcb4b6034822365c851ce4bd96686ff633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/540] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 253b3260fe43497ed3cabd0a8aa904213f074aef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/540] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From bd469f663f2b35d79e50da668900877f04b46724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/540] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 3df3bfde62a4a601e94cd6257b4f5ab4a4bc87ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/540] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From c7b088b3d00d33a9e8f65a1ca2d6d6afeac8aa03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/540] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 644107294960a1e1cefb91aa3fc17576e8604539 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/540] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 06b7fdd5a5ad2d85c2c5823c81f097dbeca5795e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 375/540] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From a8b662a9537c745ab26dcde3fb20aee0317acb76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 376/540] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 6355b74d277274e54f203f8df31c48f307c243fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/540] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From a736cc38914d0cff0a098d04892e8c4db40d9461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/540] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From c87b799307748579b080ad788ed2c280c685e0fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/540] libvncserver: rebuild against OpenSSL

---
 srcpkgs/libvncserver/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 073ab9d2d1f6ee68546f7465a6f556beeb3a9c22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/540] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From e39c1dada5b938530a239c93a8f362bb292b7289 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/540] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From e7f15b90737ca5ae3d76b4fcabe2ea20d99a80c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/540] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From e3aa90af23dfaf221337d2ee22dfb2a7156b285b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/540] musikcube: rebuild against OpenSSL

---
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 131f59bf1c351a5b914dffea0712822987cb652e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/540] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From aa9802d37ef6a7e449f0391ee6a4b035437a1910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/540] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 639d6481d520691da30ef170e4ca4930f7dd6aa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/540] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 5cd48b49563153789995510462920e390d4c95b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/540] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 210f4494df787d8692045f401302f379e8353133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/540] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 22022e40d7bfb4b21039def1a08133109759ae38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/540] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 53375e9ec4d664ecd98308ed8b5892bb4434cc4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/540] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 2d2c6523fbe9129235e8d67c48dc1d0dbfc447b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/540] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 506e0eceec306be0a42ecd10c56a79083ddf0a01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/540] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 16d542b8e6b3a108a7f1348ff0f2c60255b3ebe2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/540] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From bce6b93e8cfabcb5ae11234a3bf5af206914848a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/540] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 609e4f57a3ee4fdb191fbe3b441bff649c19f7a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/540] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From c411840aa61ab03a7c4ecb11c05cd15bc79ef076 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/540] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d148f71e96e52b789c0b9e4cb092f6f099d32a76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/540] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5157132c5c432ee03bfbf025e5b18d80382c888f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/540] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 8c88c18287ea4ee7090dcb6981aeca61dd9032a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/540] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From aa991061f1c334255954cbbf7dcac2b7c532ba4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/540] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 87de50f9b5ba4fcb87e1d11e418256927cbb1ffa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/540] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From dc23d31aecb1a3866512c91959a6ed7fa0e6c0f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/540] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 08838b2e5af95c28c5c123fa2c919250cfb5ee5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 403/540] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From e4134f4bb99dec7d9665ebd833bba39efb9f7953 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 404/540] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From d447190671d83255e187810bc526bbf573c473b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 405/540] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 34ecbe175974ff8ca700569eeefe15e1060b8141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 406/540] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 9c73671854e9d75fdea792712e06b580c544f563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 407/540] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 5e213460b9a459723e50ea057db4419456d75876 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 408/540] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 2624773d0aeb104e6f26faecab5ff38183dfe70c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 409/540] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From 3f882eff123bb5a26ee69c9a35e6747909a029be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 410/540] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7fd956570f5ba90b7590684f735e7841ca4ad043 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 411/540] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From fcfa1712271ae34f6581841d1c7edc9e0f708555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 412/540] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From e1f3dc07803e07dd72c2fefadf61e669082ed5e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 413/540] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From c7f3c4c3ca2ed695070b0b10b69c1141dc8a702f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 414/540] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 35e53d17fcccf59d9dd12ad071a0d99e7bbd2490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 415/540] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 75ebb831d760fa5ee5275903e48345816f57bcb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 416/540] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 69b821515451eac7940b04eaf2dff3fffbe99312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 417/540] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 9b30a855f9536a259bba89253e58ed627726bbc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 418/540] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 22820d10d7a9e633de51313a523bccfaa09322df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 419/540] boinc: rebuild against OpenSSL

---
 srcpkgs/boinc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 330d9d466ba2d5bf28cb5f461ffa5540bc5d8cda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 420/540] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 0b38f323d18f8c394ae79337acbce7ed47493ca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/540] clamav: rebuild against OpenSSL

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 98772d9a063448e1733582877abda1902d361561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 422/540] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 3787791a84470b93d53cfc25c8cf6fa8b334c643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/540] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 4959b3e44407394373201115a4c307711512a477 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 424/540] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 7cdf1476013edff5d717615e31f8e0eb1253a4bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/540] libgdal: rebuild against OpenSSL

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From b96185f69ece2d430cbcbadc5910032e421db2e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 426/540] lxc: rebuild against OpenSSL

---
 srcpkgs/lxc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 31d928abe0e2acd0994bcdb708d8801627e4238f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/540] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 95cc834abeae3f6aa33b3f54071d31eb200a0b23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/540] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 23fe9d05580aa2352b0de56d95e15b0811229508 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/540] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 52c7637bb10494693c1536ce2175e91ba4cf1b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 430/540] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 17e842383a47ecde19bf51e45f499cc420c166cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/540] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 791318c4719eea43cf36032d690f25eef7bec48a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 432/540] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 69d514f9efb66c310ea0e14a7a1befd95ebe68d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/540] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 5fa278b5247fb95f09551ba3b5fe8be996f4fbed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/540] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From cc8d5b01a84072384067fcd203e8e05e64aada6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 435/540] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From ddfedc40d2f10b477746fdf61af0ead287278e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/540] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 6d3fdbfafc5d076000e13fab969227ca7f2815bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/540] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 301afa7eede52addce9abbce80ca02e34556ca91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/540] sssd: rebuild against OpenSSL

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 17d2a1be0ccafb7d9d831ef5433fe4e40b48f5c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 439/540] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 1e65d8f5eb254975ee9f53dfadc13e30244cc1e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 440/540] xmlrpc-c: rebuild against OpenSSL

---
 srcpkgs/xmlrpc-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 72fa1ce534c6fddd08335d8843d9f03e4ed62ad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/540] zfs: rebuild against OpenSSL

---
 srcpkgs/zfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 05d83befb6e96f3c1d0f633970fe59f02aeb2e3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 442/540] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From aa19e438a895e1b463601528dc8b8e280b2cd844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 443/540] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 43145c1129a793965691f0d4112bda617f1760c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 444/540] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 1bcc63f38c176013edf1da6c54058255a15d03a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/540] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 754b0fc7a286cb5479f888357fa3f5d8291d7dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/540] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 8f2d88cbfcdc85dc2bfab1103c040dac2bdabe40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/540] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From e961001993547dbbcb5a8bceec18925c993d291f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 448/540] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 592b67ef09424329bf7642d6eb57b6f6b9b37842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 449/540] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a8a42aa0a3..ed7e812aab8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From f4e392b1c2b237f654b1b3db969b06112f60b488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 450/540] Ice: rebuild against OpenSSL

---
 srcpkgs/Ice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From ec9f90c8e0ce6f189dc803d6177de793087929d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 451/540] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 3aedd3a188d5c7e4d290eaae39100ed2a7241d79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 452/540] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From e6737059cce329436eff7750eba1334c13f62a9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 453/540] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8007f29a73a27254e44e931c9b9dad49bb005a7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 454/540] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 904a59078821acd1761bf5c716ee11df2c4facdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 455/540] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 0f9169ddc5e6b2e241a337ddac2db02558b116d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 456/540] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From 52dd4adb2fcc89b7a7cf097cef15871189dd6805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/540] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b0d83714ad0..74958fa598b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.177
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 80a0bf62bb47b025a04afba4b09451639608e6a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/540] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 6b26b5d339a5294fe02ddc5692908413e8c875a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 459/540] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index ae1a202938c..16f328c45e5 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.101
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 250ac53a0ad4694c8aaa5d8948a5cc462df5738b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 460/540] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e4..0ff0fdd4706 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From 9e073943236b9752457737d9f64e5394d5bf14e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:41:57 +0100
Subject: [PATCH 461/540] fixup! c-client:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 5bdb4175c62..0e03c5d048d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2355,7 +2355,7 @@ libdwarf.so.1 libdwarf-20160613_1
 libmemcached.so.11 libmemcached-1.0.18_1
 libhashkit.so.2 libmemcached-1.0.18_1
 libmemcachedutil.so.2 libmemcached-1.0.18_1
-libc-client.so.1 c-client-2007f_1
+libc-client.so.1 c-client-2007f_4
 libonig.so.5 oniguruma-6.8.1_1
 liblo10k1.so.0 alsa-tools-1.0.29_1
 libgflags.so.2.2 gflags-2.1.2_1

From 9440586af10bb89fc64f5ace389975b180efc248 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:41:58 +0100
Subject: [PATCH 462/540] fixup! libvncserver:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0e03c5d048d..62d91152eb1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1381,8 +1381,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1

From 8ddb617c1a6651cb9170ab94b1b846602b3f5c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:41:59 +0100
Subject: [PATCH 463/540] fixup! MEGAsdk:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 62d91152eb1..894c3174043 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3058,7 +3058,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30703 MEGAsdk-3.7.3c_1
+libmega.so.30703 MEGAsdk-3.7.3c_2
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1

From cc2dd157276164987e57c08a7db6eeedee1dc532 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:01 +0100
Subject: [PATCH 464/540] fixup! apr-util:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 894c3174043..8ee95c29d7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,7 +687,7 @@ libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
-libaprutil-1.so.0 apr-util-1.3.9_1
+libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.40 libopenmpi-3.0.1_1

From 1fce1c222359a4c8741c04002ee350858ffe864b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:02 +0100
Subject: [PATCH 465/540] fixup! bacula-common:

---
 common/shlibs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ee95c29d7e..b2617348012 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2943,13 +2943,13 @@ libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
-libbac-9.4.2.so bacula-common-9.4.2_1
-libbaccfg-9.4.2.so bacula-common-9.4.2_1
-libbacfind-9.4.2.so bacula-common-9.4.2_1
-libbacsql-9.4.2.so bacula-common-9.4.2_1
-libbaccats-9.4.2.so bacula-common-9.4.2_1
-libbacsd-9.4.2.so bacula-common-9.4.2_1
-libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_1
+libbac-9.4.2.so bacula-common-9.4.2_4
+libbaccfg-9.4.2.so bacula-common-9.4.2_4
+libbacfind-9.4.2.so bacula-common-9.4.2_4
+libbacsql-9.4.2.so bacula-common-9.4.2_4
+libbaccats-9.4.2.so bacula-common-9.4.2_4
+libbacsd-9.4.2.so bacula-common-9.4.2_4
+libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_4
 libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_1
 libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_1
 bpipe-fd.so bacula-fd-9.0.4_1

From 94edcfe393a0b25a6ec5f26e573389d84309a7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:04 +0100
Subject: [PATCH 466/540] fixup! boinc:

---
 common/shlibs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b2617348012..f2f28631c28 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2410,9 +2410,9 @@ libcsound64.so.6.0 csound-6.05.0_1
 libcsnd6.so.6.0 csound-6.05.0_1
 libfko.so.3 libfko-2.6.9_1
 libvterm.so.0 libvterm-0.0.20151005_1
-libboinc_opencl.so.7 boinc-7.6.2_1
-libboinc_api.so.7 boinc-7.6.2_1
-libboinc_graphics2.so.7 boinc-7.6.2_1
+libboinc_opencl.so.7 boinc-7.16.16_2
+libboinc_api.so.7 boinc-7.16.16_2
+libboinc_graphics2.so.7 boinc-7.16.16_2
 libboinc_opencl.so.7 boinc-nox-7.6.2_1
 libboinc_api.so.7 boinc-nox-7.6.2_1
 libboinc_graphics2.so.7 boinc-nox-7.6.2_1

From 2bf52dd685f88d9e6a1fe1c40b5e0c9a530a3436 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:04 +0100
Subject: [PATCH 467/540] fixup! botan:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index f2f28631c28..ebf531630b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2807,7 +2807,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_1
+libbotan-2.so.16 botan-2.16.0_3
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1

From 496def1dc935b911eb43452118b756e9a3447ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:06 +0100
Subject: [PATCH 468/540] fixup! cbang:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index ebf531630b6..41ef9ea9b0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3806,7 +3806,7 @@ libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
-libcbang0.so cbang-1.3.3_1
+libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1

From a7363803cfe1d2a178c73bdefbd5cf71ca3047e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:07 +0100
Subject: [PATCH 469/540] fixup! clamav:

---
 common/shlibs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 41ef9ea9b0a..a4a61a10e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2171,10 +2171,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.101.0_1
-libclamunrar.so.9 clamav-0.101.0_1
-libclamunrar_iface.so.9 clamav-0.101.0_1
-libfreshclam.so.2 clamav-0.102.0_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1

From fc96e54d4775faa346f99461b52a67e2ab14e475 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:09 +0100
Subject: [PATCH 470/540] fixup! dovecot:

---
 common/shlibs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a4a61a10e9c..dc2d0f75e4e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,12 +1577,12 @@ libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
-libdovecot.so.0 dovecot-2.2.11_2
-libdovecot-login.so.0 dovecot-2.2.11_2
-libdovecot-compression.so.0 dovecot-2.2.11_2
-libdovecot-sql.so.0 dovecot-2.2.11_2
-libdovecot-storage.so.0 dovecot-2.2.11_2
-libdovecot-lda.so.0 dovecot-2.2.11_2
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
 libmysqld.so.18 libmariadbclient-5.5.36_1
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1

From 7f1fa1c97bb80e4bfbf740db51fea3fbdfeb7a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:10 +0100
Subject: [PATCH 471/540] fixup! dpdk:

---
 common/shlibs | 268 +++++++++++++++++++++++++-------------------------
 1 file changed, 134 insertions(+), 134 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dc2d0f75e4e..cfb0fc3b3ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3630,140 +3630,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1

From 4230f09eb9e14cbff9fef9b936cbdd59408bf5a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:11 +0100
Subject: [PATCH 472/540] fixup! efl:

---
 common/shlibs | 78 +++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cfb0fc3b3ff..edb88d14b34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1460,42 +1460,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1855,9 +1855,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3

From 6da18fbb37e6786ea47e8bb629536bc45b958f86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:14 +0100
Subject: [PATCH 473/540] fixup! gambit:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index edb88d14b34..8853ea785c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3611,7 +3611,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1

From 8714de7b29b689df5a2ccba0cc1a9d44791c692d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:15 +0100
Subject: [PATCH 474/540] fixup! getdns:

---
 common/shlibs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8853ea785c7..c3a31fe37c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3482,10 +3482,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1

From 38c4191aceca8948d81f5fad4d6a77e8669d1128 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:17 +0100
Subject: [PATCH 475/540] fixup! grpc:

---
 common/shlibs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3a31fe37c8..e649e095a7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,18 +3572,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1

From b731722febce1de1555d59e5a918fa4133564f9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:18 +0100
Subject: [PATCH 476/540] fixup! gst-plugins-bad1:

---
 common/shlibs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e649e095a7a..e9be2a3da34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,12 +1133,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1

From 360d01c57b5d01060697d50294a7e842c5b0e99f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:18 +0100
Subject: [PATCH 477/540] fixup! gwenhywfar:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e9be2a3da34..dba4dbfa7b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1524,10 +1524,10 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
 libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
 libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
 libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1

From bf42741060921d6aac41d6f6be7ed8e065f28bc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:20 +0100
Subject: [PATCH 478/540] fixup! httrack:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dba4dbfa7b4..d91744dcf40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2147,8 +2147,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1

From dcded21ef5e2c8419a2bb1b860117cf6eb9e5b7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:21 +0100
Subject: [PATCH 479/540] fixup! ipmiutil:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index d91744dcf40..09e595751c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2575,7 +2575,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1

From 4cd53823997f43ed2bb9015a549964c8690bee84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:24 +0100
Subject: [PATCH 480/540] fixup! libarchive:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 09e595751c0..748c8343e5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -49,7 +49,7 @@ libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
-libarchive.so.13 libarchive-3.3.3_5
+libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
 libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1

From 9e0ac67d1a9ca0479c8ead4f000734706a3f9129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:24 +0100
Subject: [PATCH 481/540] fixup! libesmtp:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 748c8343e5a..2509d1824f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1323,7 +1323,7 @@ libre2.so.7 re2-2020.06.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
-libesmtp.so.6 libesmtp-1.0.6_4
+libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
 libunwind.so.8 libunwind-1.1_1

From 6513f69d9339889df6615728109306f8e91dd795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:25 +0100
Subject: [PATCH 482/540] fixup! libetpan:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2509d1824f5..9da7887a352 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2139,7 +2139,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1

From 15330bbe51658ff1a0fb5e74e3d50c8d505f5938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:25 +0100
Subject: [PATCH 483/540] fixup! libevent:

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9da7887a352..8838439dcdf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -680,11 +680,11 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.1.so.7 libevent-2.1.11_1
-libevent_core-2.1.so.7 libevent-2.1.11_1
-libevent_extra-2.1.so.7 libevent-2.1.11_1
-libevent_pthreads-2.1.so.7 libevent-2.1.11_1
-libevent_openssl-2.1.so.7 libevent-2.1.11_1
+libevent-2.1.so.7 libevent-2.1.12_2
+libevent_core-2.1.so.7 libevent-2.1.12_2
+libevent_extra-2.1.so.7 libevent-2.1.12_2
+libevent_pthreads-2.1.so.7 libevent-2.1.12_2
+libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11

From f03b28ab9c1482ed2eb75535118c0cb571d644b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:25 +0100
Subject: [PATCH 484/540] fixup! libfetch:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 8838439dcdf..77b8085b2e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -753,7 +753,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1

From 4b4001101845cb0156f6cf42deb2732329f9e9fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:25 +0100
Subject: [PATCH 485/540] fixup! libfido2:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 77b8085b2e7..b57e0bc59d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3803,7 +3803,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3

From 9911300fa683b5a661384b120109c2a9546bcbb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:26 +0100
Subject: [PATCH 486/540] fixup! libgda:

---
 common/shlibs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b57e0bc59d5..6d205943f50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,10 +1395,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1

From 23f42105405480c63e6fe970bb5a98a681b55889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:26 +0100
Subject: [PATCH 487/540] fixup! libgdal:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 6d205943f50..b3e7149a919 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2423,7 +2423,7 @@ libu2f-host.so.0 libu2f-host-1.0.0_1
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1

From 46ac078208861b28b9852f09b2c476305371b37a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:26 +0100
Subject: [PATCH 488/540] fixup! libgit2:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index b3e7149a919..cda793d4629 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1338,7 +1338,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1
 libunwind-setjmp.so.0 libunwind-1.4_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
-libgit2.so.1.0 libgit2-1.0.0_1
+libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1

From f8e31995a460b9f7bf43aa5c898325b5973dec96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:26 +0100
Subject: [PATCH 489/540] fixup! libimobiledevice:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index cda793d4629..a52b7e198fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_1

From bd1ef5594ba1a0875fa7a81357c437ef5514ae53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:27 +0100
Subject: [PATCH 490/540] fixup! libircclient:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index a52b7e198fc..88f095e0db4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1

From 6917e2a2ced13aed542a1595e20783ae017900e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:27 +0100
Subject: [PATCH 491/540] fixup! libknet1:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 88f095e0db4..a0b8d31a521 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3617,7 +3617,7 @@ libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1

From 3cf996c810a9853b5167c76d30577bc1748c46f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:27 +0100
Subject: [PATCH 492/540] fixup! libmowgli:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index a0b8d31a521..2779335aa83 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1110,7 +1110,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1

From 50789ca8eea42aa11c40b899c2e0515bf5e0478c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:28 +0100
Subject: [PATCH 493/540] fixup! libnice:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2779335aa83..0922757a897 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -801,7 +801,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1

From 0ce84232a330c8120b916cab9b46b027b53675d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:28 +0100
Subject: [PATCH 494/540] fixup! libostree:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 0922757a897..550fcbcdd38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2919,7 +2919,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1

From e504138a34a2f918ed8d7386571aff2b40aa3e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:28 +0100
Subject: [PATCH 495/540] fixup! librdkafka:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 550fcbcdd38..0cb20f3ba33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3788,8 +3788,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1

From 6bb0eec0a91fa8e9c3868fb6fc98a27e8b1e8597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:28 +0100
Subject: [PATCH 496/540] fixup! libssh:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 0cb20f3ba33..075d1874104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1366,7 +1366,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1

From 9d2b04da21d045fefe47ff2687b0f7954f731b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:29 +0100
Subject: [PATCH 497/540] fixup! libssh2:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 075d1874104..c85c491f1da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1061,7 +1061,7 @@ libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
-libssh2.so.1 libssh2-1.4.1_1
+libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
 libsnmp.so.40 libnet-snmp-5.9_1
 libnetsnmp.so.40 libnet-snmp-5.9_1

From 05088de60500dcbfe3ea1aaf6f68ef93cbe6a527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:29 +0100
Subject: [PATCH 498/540] fixup! libstrophe:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index c85c491f1da..2ef0bd4c055 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1790,7 +1790,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1

From b0307d74185ccf78cddbbc0ad3d6745bfc4e1db3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:29 +0100
Subject: [PATCH 499/540] fixup! libtd:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2ef0bd4c055..bd1df9db6d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3852,7 +3852,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1

From b57c70c49f7b4168bd69b33623089f87788d0a42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:29 +0100
Subject: [PATCH 500/540] fixup! libtorrent:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index bd1df9db6d8..2bcda2c6bd8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,7 +819,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1

From 8d425905fa4f7415fa6d0e47194e6b0e83d0114b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:30 +0100
Subject: [PATCH 501/540] fixup! libtorrent-rasterbar:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2bcda2c6bd8..2a1ec23ed59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2004,7 +2004,7 @@ libldns.so.3 libldns-1.7.1_1
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1

From fcdf41e599a33de7fc3d5bf6d6627e9f01991698 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:30 +0100
Subject: [PATCH 502/540] fixup! libu2f-host:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2a1ec23ed59..371eb3a6be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2419,7 +2419,7 @@ libboinc_graphics2.so.7 boinc-nox-7.6.2_1
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1

From 6197575ae889422fdb25644afef3cf51ce30ea89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:30 +0100
Subject: [PATCH 503/540] fixup! libu2f-server:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 371eb3a6be4..760492631ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,7 +2420,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.4_9

From 69713e6e790de3f8e12b93cbabcc00b9cb9e4894 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:31 +0100
Subject: [PATCH 504/540] fixup! libucl:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 760492631ac..79f74aead57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1840,7 +1840,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1

From 6ea65766258130d2eceffc0e1bd781ced6a72d80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:31 +0100
Subject: [PATCH 505/540] fixup! libwebsockets:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 79f74aead57..47b83529a8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2162,7 +2162,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2

From 812958935e9813e8c01079ddde97f7a0741ba0db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:31 +0100
Subject: [PATCH 506/540] fixup! libzip:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 47b83529a8f..dd5cc68723a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1211,7 +1211,7 @@ libtinyxml.so.0 tinyxml-2.6.2_1
 libtinyxml2.so.8 tinyxml2-8.0.0_1
 libbluray.so.2 libbluray-1.0.0_1
 libnfs.so.13 libnfs-4.0.0_1
-libzip.so.5 libzip-1.2_1
+libzip.so.5 libzip-1.7.3_2
 libluajit-5.1.so.2 LuaJIT-2.0.0_1
 libOSMesa.so.8 libOSMesa-9.1_1
 libtaginfo.so.1 libtaginfo-0.1.3_1

From 9caa1a2baad91d49d4bac922398bff3bafac7795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:33 +0100
Subject: [PATCH 507/540] fixup! live555:

---
 common/shlibs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd5cc68723a..f921182b03c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2963,10 +2963,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1

From fe83e1e1cd737a0c465d1d0c5fdefacd62f87c05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:33 +0100
Subject: [PATCH 508/540] fixup! loudmouth:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index f921182b03c..d37d4cd0a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2003,7 +2003,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_1
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1

From 0632a2db4028900e1e7b939a173dab46c895e44f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:38 +0100
Subject: [PATCH 509/540] fixup! mtxclient:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index d37d4cd0a75..7108f93f5f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1

From 6e898c730cd987eda51c9447b8fbfd0f01e6d821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:39 +0100
Subject: [PATCH 510/540] fixup! musikcube:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 7108f93f5f9..b36cc26d457 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -579,7 +579,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1

From 7c0fc84ec76be668aa0a0b4a5008ead4a369a594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:40 +0100
Subject: [PATCH 511/540] fixup! neon:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index b36cc26d457..2d91e5f57a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -754,7 +754,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1

From 04ddd4701fbab11d9530831bae31b560778772e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:41 +0100
Subject: [PATCH 512/540] fixup! nghttp2:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 2d91e5f57a6..da6f998594a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2190,7 +2190,7 @@ libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
-libnghttp2.so.14 nghttp2-1.0.2_1
+libnghttp2.so.14 nghttp2-1.43.0_2
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1

From 47875f4be92c41028f1478ca25e7801537b293ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:43 +0100
Subject: [PATCH 513/540] fixup! opendkim:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index da6f998594a..03599d3275c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2664,7 +2664,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1

From 7155cf93283e2bca0f30222d7df0ee2e0fdd9a1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:45 +0100
Subject: [PATCH 514/540] fixup! opusfile:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 03599d3275c..65efc054a17 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1201,8 +1201,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1

From 730d34597c947d49f3573dc996f89453b5c0244f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:49 +0100
Subject: [PATCH 515/540] fixup! pjproject:

---
 common/shlibs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 65efc054a17..7787a138cfc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2465,20 +2465,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2

From c949fe70e2a1908b80039f810ca09c7d2d4128df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:49 +0100
Subject: [PATCH 516/540] fixup! pkcs11-helper:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 7787a138cfc..d4ff8118e88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3085,7 +3085,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
 libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
 libr_cons.so.5.0.0 radare2-5.0.0_1

From 178ce00b138ff79e869dd05d5ccb75462e6d0fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:49 +0100
Subject: [PATCH 517/540] fixup! poco:

---
 common/shlibs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d4ff8118e88..5ba6da1fc59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2926,19 +2926,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1

From 28f8877b0a1055c424705a878ae3f5966897e53d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:51 +0100
Subject: [PATCH 518/540] fixup! python:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 5ba6da1fc59..42956a6c2e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
-libpython2.7.so.1.0 python-2.7_1
+libpython2.7.so.1.0 python-2.7.18_3
 libffi.so.7 libffi-3.3_1
 libffcall.so.0 ffcall-2.1_1
 libavcall.so.1 ffcall-2.1_1

From a2f7f29242f444d3461c2c7480189b205dd706dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:52 +0100
Subject: [PATCH 519/540] fixup! python3:

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42956a6c2e2..84e334d7868 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1734,8 +1734,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.8.0_1
-libpython3.9.so.1.0 python3-3.9.0_1
+libpython3.so python3-3.9.2_2
+libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1

From 362e435cf413ab4472d1b98b2c2296581f0bb3c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:53 +0100
Subject: [PATCH 520/540] fixup! qca-qt5:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 84e334d7868..bdec845b9a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2175,7 +2175,7 @@ libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
-libqca-qt5.so.2 qca-qt5-2.1.3_1
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1

From be0b93ad2fab9dec1b874a5d1fdafc8bbcef1586 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:53 +0100
Subject: [PATCH 521/540] fixup! rabbitmq-c:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index bdec845b9a5..81e608f06c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3627,7 +3627,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5

From 07609cfaaba1a6d8f2c2da5fe3f80d2e285b42b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:54 +0100
Subject: [PATCH 522/540] fixup! re:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 81e608f06c4..cdd894bdcf4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3375,7 +3375,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-0.5.8_1
+libre.so re-1.1.0_2
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1

From 5d6e6c455b97d1c37c9ab96170d4e14568b7bbc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:54 +0100
Subject: [PATCH 523/540] fixup! rhash:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index cdd894bdcf4..6043854ab15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2920,7 +2920,7 @@ libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
-librhash.so.0 rhash-1.3.4_1
+librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1

From c45b2c666bfd6495138726afa2fd4b710b884988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:56 +0100
Subject: [PATCH 524/540] fixup! ruby:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 6043854ab15..a0566154a5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -435,7 +435,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.1_1
+libruby.so.2.7 ruby-2.7.2_3
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1

From c1826d0df31b574b174a2daddccc3d0b289a2d85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:57 +0100
Subject: [PATCH 525/540] fixup! seafile-libclient:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index a0566154a5c..f4991a58b50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2516,7 +2516,7 @@ libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1

From 3fdfb615992e904d38d71b350563f1b0c18e5306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:58 +0100
Subject: [PATCH 526/540] fixup! serf:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index f4991a58b50..3cf456b3cf9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1414,7 +1414,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1

From 238f93e0d44b1a8dbbe067d12b0d100bfda240f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:59 +0100
Subject: [PATCH 527/540] fixup! spice:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 3cf456b3cf9..d3a996c2fe3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -783,7 +783,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1

From 5f6864371d149a6eb5c5a30a725ccf54eadf28d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:42:59 +0100
Subject: [PATCH 528/540] fixup! spice-gtk:

---
 common/shlibs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3a996c2fe3..b8b2cd75e2f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1167,9 +1167,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1

From d926aa9d03d18b1bfd63dd8adc7b5a5561e4b70c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:00 +0100
Subject: [PATCH 529/540] fixup! sqlcipher:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index b8b2cd75e2f..4ad6aae9283 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2421,7 +2421,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1

From 2b6bbced2c636e6e0d2bc626a237b8055f0af4f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:01 +0100
Subject: [PATCH 530/540] fixup! sssd:

---
 common/shlibs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4ad6aae9283..d9550f74022 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2674,15 +2674,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2

From 864f01bad0a6eb34ab43e30b484845864f0183f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:01 +0100
Subject: [PATCH 531/540] fixup! swi-prolog:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index d9550f74022..152a89327cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2808,7 +2808,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1

From 8ab05bcc4e8b1cd1c3b7462e272054f940596617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:02 +0100
Subject: [PATCH 532/540] fixup! swiften:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 152a89327cb..77e39196569 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2534,7 +2534,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1

From c8d2ce5f1fdef54bdacccca66475f0b8114585de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:05 +0100
Subject: [PATCH 533/540] fixup! trousers:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 77e39196569..f4b5644a341 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2489,7 +2489,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1

From fd42e351696c45c830498ada4d05c778fbc95b1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:09 +0100
Subject: [PATCH 534/540] fixup! wvstreams:

---
 common/shlibs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f4b5644a341..4353831bcd6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2076,10 +2076,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1

From 301ce6c00a16e0986433f4219a4f20c5a8e4ee5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:10 +0100
Subject: [PATCH 535/540] fixup! xar:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 4353831bcd6..0ce2b564099 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1096,7 +1096,7 @@ libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-104_1
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1

From 2e3f0c6ab5d4b946e196c801e445816bd9db13cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:11 +0100
Subject: [PATCH 536/540] fixup! xmlrpc-c:

---
 common/shlibs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ce2b564099..282cc4c3ed5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1738,22 +1738,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1

From f868e6229139351c2eb22c84f1ba05d6a465b713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:11 +0100
Subject: [PATCH 537/540] fixup! xmlsec1:

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 282cc4c3ed5..fae7b1b1a27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1535,9 +1535,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1726,8 +1726,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1

From 13d3073d6b4adf7a3dc85b73f558ba0d00353bfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:12 +0100
Subject: [PATCH 538/540] fixup! zchunk:

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index fae7b1b1a27..a5ccf003313 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3486,7 +3486,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1

From f8f7a60c14b8f71c253546de2f03f028dd1289b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:12 +0100
Subject: [PATCH 539/540] fixup! zeek:

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a5ccf003313..603c6962c91 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3494,11 +3494,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1

From 964482294889e7362911f2d979c1601ead8e0b23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Mar 2021 22:43:12 +0100
Subject: [PATCH 540/540] fixup! zfs:

---
 common/shlibs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 603c6962c91..ce1c61c5150 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3777,12 +3777,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 680341 bytes --]

From 41af3c3a2509e2a487aeaf398d30153f09691f20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/460] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 9fccf0e3149ccb95252b8d747e0a138859155144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 002/460] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..fdd5986a740 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From d97139ba597955428b7e79cda81018ad6bc7472c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 003/460] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..95c48dbe8cd 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bba239af93c3801c6e2fed96dfc0feb74e5071bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 004/460] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..f62a206c1fd 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ce27baadd72607a2d4bd20170e9ecf7be681e8cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 005/460] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..b394a98c10b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 15e5b1cc6c7f1832f7329c48af4034b2729b6e28 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 006/460] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index c836cc1a377..dff7be03a35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From e323b09bf884eb6f2ba5e79fe140317f696d2add Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 007/460] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 9a9a6423a3e0208268cf6ae59edad5cbd39110ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 008/460] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 62d69f86b9d92979c92b7e8987aaeecb7273606a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 009/460] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 3640c8e90b1e673f3566c0d391a81fb13443bf16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 010/460] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f176a955cc147c121484ebfd777aeb313023f9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 011/460] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From c554741c2a5caaa03eb18906ac588186cd62e923 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 012/460] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index dff7be03a35..305041c8e5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From c5e0dd05c5cc531a1a2f21531bf86672fc9036f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 013/460] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 305041c8e5a..5bdb4175c62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From d42aefbcf4c96adc3ac4aea1f529b8c01a674d53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 014/460] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..854e76a613c 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 07f8c72ae3f38ba205e21c29801e383b92a16f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 015/460] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From e1863466a6de25344e855cb19815a9d8ca75f1e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 016/460] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 87fcad8c6791fdf30f9df131b2b66870d2cdcad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/460] MEGAsdk: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/MEGAsdk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bdb4175c62..1375f975e42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3058,7 +3058,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30703 MEGAsdk-3.7.3c_1
+libmega.so.30703 MEGAsdk-3.7.3c_2
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 4f759e9a016e31b8fc5132cc9d21849317e54cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/460] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From a7be6f27bca2c8b90f6565d165634b26883c9807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 019/460] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From a4067629d162b62c1d9fd89115b68a4e502236fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 020/460] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d0362ce4b494338650f47dd9ceeaa6e2c4193be4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/460] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From c33433d1c7553b81297dfc5df0b5043dc5fb9441 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/460] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From dc0f0b53cf8ffe08db0dd3925a4824f330388cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 023/460] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 812d74b0c17df3201bf37e6f2b42fd9fac916738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 024/460] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e6ec606b11610edb1ce7aafb3dbdfc85f72fdae7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/460] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From ee4395b757b40b5308e89d9d405032af5516383f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 026/460] apr-util: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/apr-util/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1375f975e42..acfe3c2f32c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,7 +687,7 @@ libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
-libaprutil-1.so.0 apr-util-1.3.9_1
+libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From aea7fd4abb86be5ce4c78cc9c82635e8e565a43e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 027/460] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8867b8341a6a441ef4be954f794ba45d8bbaefe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/460] aria2: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/aria2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index acfe3c2f32c..b282e859076 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3073,7 +3073,7 @@ libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
 libzim.so.6 libzim-6.0.1_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
-libaria2.so.0 libaria2-1.33.1_3
+libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
 librpmsign.so.9 librpmsign-4.15.0_1
 librpmbuild.so.9 librpmbuild-4.15.0_1
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From d77ec6b3251aaf9a1997705fe251c7b6c087ac0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/460] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bae3d4183bff0f394b01b7ef7a9deb5ecf5934d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/460] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 774d997070d87d1033916ce622f7135fc5e8fad9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 031/460] bacula-common: rebuild against OpenSSL

---
 common/shlibs                  | 20 ++++++++++----------
 srcpkgs/bacula-common/template |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b282e859076..21ee88dcd34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2943,16 +2943,16 @@ libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
-libbac-9.4.2.so bacula-common-9.4.2_1
-libbaccfg-9.4.2.so bacula-common-9.4.2_1
-libbacfind-9.4.2.so bacula-common-9.4.2_1
-libbacsql-9.4.2.so bacula-common-9.4.2_1
-libbaccats-9.4.2.so bacula-common-9.4.2_1
-libbacsd-9.4.2.so bacula-common-9.4.2_1
-libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_1
-libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_1
-libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_1
-bpipe-fd.so bacula-fd-9.0.4_1
+libbac-9.4.2.so bacula-common-9.4.2_4
+libbaccfg-9.4.2.so bacula-common-9.4.2_4
+libbacfind-9.4.2.so bacula-common-9.4.2_4
+libbacsql-9.4.2.so bacula-common-9.4.2_4
+libbaccats-9.4.2.so bacula-common-9.4.2_4
+libbacsd-9.4.2.so bacula-common-9.4.2_4
+libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_4
+libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_4
+libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_4
+bpipe-fd.so bacula-fd-9.4.2_4
 libnftables.so.1 libnftables-0.9.1_1
 libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From b95dda34f83e9122219a3f85f7d0cab5930fb598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 032/460] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From bc9d24f398d68c2477af1ad524ce9ea8bcb9625c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/460] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 87c1479512491c9a10959fa9e3328cf0eb3b2394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/460] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From ef93588c65f54d2d294917471ba6fe5f351823db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/460] bind: rebuild against OpenSSL

---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 21ee88dcd34..7dc94cccc2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1013,13 +1013,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.12.so bind-libs-9.16.12_1
-libdns-9.16.12.so bind-libs-9.16.12_1
-libirs-9.16.12.so bind-libs-9.16.12_1
-libisc-9.16.12.so bind-libs-9.16.12_1
-libisccc-9.16.12.so bind-libs-9.16.12_1
-libisccfg-9.16.12.so bind-libs-9.16.12_1
-libns-9.16.12.so bind-libs-9.16.12_1
+libbind9-9.16.12.so bind-libs-9.16.12_2
+libdns-9.16.12.so bind-libs-9.16.12_2
+libirs-9.16.12.so bind-libs-9.16.12_2
+libisc-9.16.12.so bind-libs-9.16.12_2
+libisccc-9.16.12.so bind-libs-9.16.12_2
+libisccfg-9.16.12.so bind-libs-9.16.12_2
+libns-9.16.12.so bind-libs-9.16.12_2
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 3a2e9e083d801b275375554ee1cc9de87d4f77a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 036/460] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From ef96ec11ba5a679bfce9d62851c23a033208f186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 037/460] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 8fa0ffb2fc7b6f65cb36db49db602d9332d855d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/460] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From fd4099bb4346bd166313011fa78baa6514a01862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/460] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From f2719e1b495a622e129a222ba55d7ef7c8c5c92b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 040/460] botan: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/botan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7dc94cccc2b..ccaa2340d0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2807,7 +2807,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_1
+libbotan-2.so.16 botan-2.16.0_3
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From eb12290df7c050766e3632601554761a04048b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 041/460] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 3bdb31af498a1939a7c6176ec86a3eef1061c14c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/460] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From c79f2d879fe96f898d56a1298c97d09589d6cb62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 043/460] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 5d96096de365e28f1bd2d17a46d67e4eeb137514 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 044/460] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1939324d1eed091e08ca3e239fa06e0eb5dd141e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/460] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From eccfc98d51489cb02446213e6dd34808acf09297 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/460] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 89350cbd47cdf2a9c3052d20a6dc83ee83e7690e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/460] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From fd8562600b7294b4917a2ab78d23101b40e05047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 048/460] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From bf0f1c215eb09659f79c5e8e5f8781c0dff0a3c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 049/460] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 4aa1fd8ca78835e4b6948aeb4e16cb30dfb1dcf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/460] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 1f23cbda3470a0483698ed95cee0586f068fd659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/460] cbang: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/cbang/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccaa2340d0f..5effa646a8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3806,7 +3806,7 @@ libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
-libcbang0.so cbang-1.3.3_1
+libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From d57e8efc8f9cce38bece235e33509babdc086738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 052/460] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 3cd7e674cacd1e18a552eb4b77ccaac8db7607a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 053/460] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 2400e39ec4a0f25359866c40adf3ba9f9a642c89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/460] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 5b5597024ec8d747e1d647745d62e93dcba0712f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 055/460] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 747cfa1f737d5d94333eb2c095a38ba9874b26e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 056/460] collectd: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/collectd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5effa646a8c..c086e27fe76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2362,7 +2362,7 @@ libgflags.so.2.2 gflags-2.1.2_1
 libgflags_nothreads.so.2.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
-libcollectdclient.so.1 libcollectdclient-5.5.0_1
+libcollectdclient.so.1 libcollectdclient-5.12.0_3
 libpinktrace_0.9.so.9 pinktrace-0.9.1_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From de43e1bcbf3985f3b7215de85a0c03f78465ec42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/460] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From a66c7ca49633a08581306fd75c9b399c7b087c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/460] cryptsetup: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/cryptsetup/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c086e27fe76..567208278e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1030,7 +1030,7 @@ libcss.so.0 libcss-0.1.1_1
 libhubbub.so.0 libhubbub-0.1.1_1
 liblutok.so.3 lutok-0.4_1
 libmtdev.so.1 mtdev-1.1.2_1
-libcryptsetup.so.12 libcryptsetup-2.0.0_1
+libcryptsetup.so.12 libcryptsetup-2.3.4_2
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From d200d2e745c33e16c9934f223a5b8c2e8a7a924a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/460] curl: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/curl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 567208278e7..fe04fc90149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -361,7 +361,7 @@ libfreebl3.so nss-3.12.4_1
 libnssdbm3.so nss-3.12.4_1
 libnssckbi.so nss-3.12.4_1
 libnss3.so nss-3.12.4_1
-libcurl.so.4 libcurl-7.19_1
+libcurl.so.4 libcurl-7.75.0_2
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From ee8bdbb9118f811699951e2ad8dc9de498ef5ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 060/460] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From c223f587a8531039e657cb7147aced296b568a79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 061/460] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From 69fbc51d5191f31ade8ca191e0ae160071f828ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/460] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From e9495c3365c58e7df8e3007b3030670770374efd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/460] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 38fcd56e6a05a1c33a9a4e0d7cac4a606a591483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/460] dovecot: rebuild against OpenSSL

---
 common/shlibs            | 12 ++++++------
 srcpkgs/dovecot/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe04fc90149..95d4b00d4ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,12 +1577,12 @@ libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
-libdovecot.so.0 dovecot-2.2.11_2
-libdovecot-login.so.0 dovecot-2.2.11_2
-libdovecot-compression.so.0 dovecot-2.2.11_2
-libdovecot-sql.so.0 dovecot-2.2.11_2
-libdovecot-storage.so.0 dovecot-2.2.11_2
-libdovecot-lda.so.0 dovecot-2.2.11_2
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
 libmysqld.so.18 libmariadbclient-5.5.36_1
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 2c33536fda246ee5bf294f33b6792e98672d035c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 065/460] dpdk: rebuild against OpenSSL

---
 common/shlibs         | 268 +++++++++++++++++++++---------------------
 srcpkgs/dpdk/template |   6 +-
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 95d4b00d4ce..37f0567c6ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3630,140 +3630,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 4dd5992a9feac88ace3ceb3fd583296f2ddeb3ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 066/460] ecryptfs-utils: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/common/shlibs b/common/shlibs
index 37f0567c6ef..0122864ce8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1094,7 +1094,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
 libvdehist.so.0 libvde2-2.3.2_1
 libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 5300ca4412a5685656b4325997133b04bdc052f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/460] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 20c98164d1511df21abb2047f9771469a25ad15f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/460] efl: rebuild against OpenSSL

---
 common/shlibs        | 78 ++++++++++++++++++++++----------------------
 srcpkgs/efl/template |  4 +--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0122864ce8c..8c7fc32ef9b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1460,42 +1460,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1855,9 +1855,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 14a1b371c58af7c4cb07e09e7a14497e9df67156 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/460] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From bc23b812211d24786b505be5a66d54606d8663b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 070/460] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 34b5ae34abde3304b3d9cc329c0ebcf51f0c78ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 071/460] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From da999853ab211202c09a675d9811940acc5ee1fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/460] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From fa86077f348abd3618338695abf65f64c47e6f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/460] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From df25e37f483e4fdb90310101bf92d1b7f4db3992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/460] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 8c18514340e8615eee6430f8bf4113cafd3f416e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 075/460] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 19d061f654c273eaf4f555fab7eebb31329fad79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 076/460] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From cbb65c7164339dd266f88ab99d3a5ce0b68fe583 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/460] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 022c6b05e72ddba92559496b286759c2e38818b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/460] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From 73bb4e22d68cb4d2889add97eeec0bfc1e3c3b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/460] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From a65a4b7c1567419e50ce6ea9b1cd205e730581a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 080/460] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From ae108af40847ffbba1ec7e1eeb794f4fedab95e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 081/460] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From f50909c51b99af850120b8ae467943a0ae603d48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/460] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From f0e0975008e88dc11c5dd7880089b361987a1acc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/460] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 9e68eb5e67812ecbb0b9788b6c21861cb6988fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/460] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 1063d4e5e7413bd8b1266a7b17f115f77999cdc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 085/460] freerdp: rebuild against OpenSSL

---
 common/shlibs            | 26 +++++++++++++-------------
 srcpkgs/freerdp/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c7fc32ef9b..6020e896a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1595,19 +1595,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
 libcppunit-1.14.so.0 libcppunit-1.14.0_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From d54652a9df9915505a17d96133bbe35886e94190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 086/460] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 5d58f61c056265a580211c8c21fa1cafa439150f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/460] gambit: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/gambit/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6020e896a29..5f6d1951d45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3611,7 +3611,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 00c09570165229e5961e1a4229b52a8ce55250af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/460] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 077856d54974952766b6a8c70c41b7c5f79f526d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 089/460] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b6e584144fab8844c72f3650b97d448c251db60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 090/460] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 94e34988fe29be177a58850fc3e626316f6c7a79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/460] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 06e559cfb4d6132b81b15d9e6d1e78d038e4c3be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/460] getdns: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/getdns/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f6d1951d45..25d333c4959 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3482,10 +3482,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 3e99d9c5f6432b132d041b5a9c194a3dbcbecbc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/460] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 5d338b8531817893d0500ecff3884fbeb2359d3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 094/460] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 275b0186906e7f6dea536b23c55cf7d0e9ceb4a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 095/460] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From a080a9087db9d8488877f2421f907011a30d1c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/460] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 1e801021a5ca6eedfc8606edaa5d0275c576e331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/460] glusterfs: rebuild against OpenSSL

---
 common/shlibs              | 14 +++++++-------
 srcpkgs/glusterfs/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 25d333c4959..74867352226 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1440,13 +1440,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From ea8bb6c82aa16e2eb5d9a91c990f05fe3c658a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 098/460] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From ea26d2ac263af56a846ad90c8255b14b39fc9e08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 099/460] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 2d6676586e6b263e9ffca1765e77453af99d1613 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/460] grpc: rebuild against OpenSSL

---
 common/shlibs         | 24 ++++++++++++------------
 srcpkgs/grpc/template |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 74867352226..aab880ea53b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,18 +3572,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..20fdf667fa6 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 76a75a4168272d3ce7ae6c80b33036db8a04f5fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/460] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From f74523107b467c8877686ac492c9bc6eb634f8e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/460] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 11cf3f3f80a141cd94c3bb872adc62d7bc3a8cc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 103/460] gst-plugins-bad1: rebuild against OpenSSL

---
 common/shlibs                     | 12 ++++++------
 srcpkgs/gst-plugins-bad1/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aab880ea53b..15c74992708 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,12 +1133,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From e2587014013a32f993dfae9007eb75e83accd2c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 104/460] gwenhywfar: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/gwenhywfar/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 15c74992708..82d25d61c60 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1524,11 +1524,11 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1
 libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From bc159ba9e0f8581981dfeac42d5d9e58c156105b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/460] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b882a4873df02002736af051c7280b4fa9fe01e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/460] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From f4391ce67fdcc62682b290bccb5ae4fbab27139b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/460] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 1ea99afbd29e35c26a9697aa3b01c56d9d678808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 108/460] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From adedf06d6154b580efcaaafbcd11daa5236afaca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 109/460] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 083e095dd54d48cd20ee20c5a921fd750777608f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/460] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From b62252a189e85c781978352941ee0959f3191042 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/460] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From aed51615ec6958333276e89c62a1045e19db3e4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 112/460] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 701b6f06a175a1871b289cdd71e9b6fefd8026ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 113/460] httrack: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/httrack/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 82d25d61c60..3e8eb3a53ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2147,8 +2147,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 234107619c8b39ce174e6246b5e9978a6dec6608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/460] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From f6c4fcdfac3f96ee7595182e119b61e5a9806b8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/460] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6ae5ebf9edc75e0081168af099c0d14ef5ad3ee2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/460] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 4ebb6f4275912e3bf2ee249ced178b30fa2af1a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 117/460] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From f9a44fc1ddf1369efeb52efef5c1471bde7fabf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 118/460] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From d6b58975b8eacdff6bd00ab78860dc4101c8e76b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/460] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 41db7b7b2add2cb2b937f46b6615d064433c58ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/460] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 3c4b2b07066414ee46ff9debc5d1e76bf97072f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/460] ipmiutil: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/ipmiutil/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e8eb3a53ed..db59c3ecd3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2575,7 +2575,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From c98ca8a53b0a8597d09593ea6511b5fe98ff90d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 122/460] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 19e08131689fd60fede5c393980f1808b2b170a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 123/460] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 947bfca471b1a764c9fda1dfe91b50debef25709 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/460] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 296c8ed65ca44c0cf90d92c74d033670e0786098 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/460] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From ff35af82d86171fa444fa7bca23da103de0af507 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/460] kea: change botan build-option to use OpenSSL

---
 common/shlibs        | 40 ++++++++++++++++++++--------------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db59c3ecd3c..b1ea4fcf930 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2831,26 +2831,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
 libkj-async-0.8.0.so capnproto-0.8.0_1
 libkj-test-0.8.0.so capnproto-0.8.0_1
 libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_1
-libkea-http.so.23 libkea-1.9.4_1
-libkea-log.so.18 libkea-1.9.4_1
-libkea-pgsql.so.18 libkea-1.9.4_1
-libkea-process.so.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 69e7c6f264bdd12507c0e747e18c03e8e4c618b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 127/460] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7e6ba042e3a90bfcbe3dc7926ae4923033c32a03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 128/460] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From a64fe814244b634691e5427e57c99b42b015db00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/460] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From bdb6740a2d49c4e9e7f9052c18369d501682257d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/460] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From a62494c1e1db4fff1867dd3f4abe0ba4edbfc348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 131/460] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 2ad02cf3f8b22dbdf3eae892be9dd93c25f16b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 132/460] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From fe79227acefe94616dfb22e34c60ef5b7a88b792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/460] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 00cad819ec8332955387b1f9a5852d941d0605e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/460] ldns: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ldns/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b1ea4fcf930..5a13a319c2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,7 +2000,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From c58dfaf95ac8acfcb6ba561c0f808e00a0d2a601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 135/460] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2d759080f4087caff3321a35fa1f5a432f89fc1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 136/460] libarchive: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libarchive/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5a13a319c2d..dd1248160f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -49,7 +49,7 @@ libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
-libarchive.so.13 libarchive-3.3.3_5
+libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
 libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 77d1addf580d5351f0011581c1d431bb67eff1b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/460] libesmtp: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libesmtp/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd1248160f7..69a71b31d50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1323,7 +1323,7 @@ libre2.so.7 re2-2020.06.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
-libesmtp.so.6 libesmtp-1.0.6_4
+libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
 libunwind.so.8 libunwind-1.1_1
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From f7fbbcb8fd355bd5b66152031ddd8e02b1ff0342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/460] libetpan: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libetpan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69a71b31d50..2701a5a792e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2139,7 +2139,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From de7fc35b8aaef8738ff8e63683cf21a42a9b580f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/460] libevent: rebuild against OpenSSL

---
 common/shlibs             | 10 +++++-----
 srcpkgs/libevent/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2701a5a792e..c9c6f12a695 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -680,11 +680,11 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.1.so.7 libevent-2.1.11_1
-libevent_core-2.1.so.7 libevent-2.1.11_1
-libevent_extra-2.1.so.7 libevent-2.1.11_1
-libevent_pthreads-2.1.so.7 libevent-2.1.11_1
-libevent_openssl-2.1.so.7 libevent-2.1.11_1
+libevent-2.1.so.7 libevent-2.1.12_2
+libevent_core-2.1.so.7 libevent-2.1.12_2
+libevent_extra-2.1.so.7 libevent-2.1.12_2
+libevent_pthreads-2.1.so.7 libevent-2.1.12_2
+libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 84db206979651a6a7629250cc9e7ef04a1df3b81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 140/460] libfetch: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfetch/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c9c6f12a695..0b29dd1a46a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -753,7 +753,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8d7fa5b1ea404511a29248cd03882dbe097625b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 141/460] libfido2: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfido2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b29dd1a46a..d3bdd768276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3803,7 +3803,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From c79ed93ffebbf63ad680fdfb3501cc1dc567750a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/460] libgda: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/libgda/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3bdd768276..8b07fc46161 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,10 +1395,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From cf342dba46ba2fc88564e85d33dc66cf3d82c773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 143/460] libgit2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgit2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b07fc46161..2591b01a24b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1338,7 +1338,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1
 libunwind-setjmp.so.0 libunwind-1.4_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
-libgit2.so.1.0 libgit2-1.0.0_1
+libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 4b299e4317b32049d2b32f608129a78dcf9fb059 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 144/460] libimobiledevice: rebuild against OpenSSL

---
 common/shlibs                     | 2 +-
 srcpkgs/libimobiledevice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2591b01a24b..a767d7888e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 87ba8c9611c4b3575c9c9983aed56277c4a8aa3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/460] libircclient: rebuild against OpenSSL

---
 common/shlibs                 | 2 +-
 srcpkgs/libircclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a767d7888e4..d031ce2a12f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From dc1bca5416d1afc217a496a12e851a8ddd5483d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/460] libknet1: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/libknet1/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d031ce2a12f..577bfdfddd8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3617,11 +3617,11 @@ libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 42e104ff81d3fb2505fbbd6fa3d071f42903287a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/460] libmowgli: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libmowgli/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 577bfdfddd8..6a37071e657 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1110,7 +1110,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 33f8ca9f9346748f8c544a0abf963a7e34a148d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 148/460] libnice: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libnice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6a37071e657..4eeb96cd81a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -801,7 +801,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 5b018430849c91562d35488fa618f1c61ca5a501 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 149/460] libostree: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libostree/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4eeb96cd81a..2346e95843a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2919,7 +2919,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 735a7e0d6f37c5097fe84f6e4d437771da18bc41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/460] librdkafka: rebuild against OpenSSL

---
 common/shlibs               | 4 ++--
 srcpkgs/librdkafka/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2346e95843a..55c18ee909f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3788,8 +3788,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From df98f603e78e76e12612e4541bc6b490e1630c20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/460] libssh: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libssh/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 55c18ee909f..342f653031f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1366,7 +1366,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c53d18d39dfad64f3bacd0aa567fa1be423a16e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/460] libssh2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libssh2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 342f653031f..6137c67d370 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1061,7 +1061,7 @@ libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
-libssh2.so.1 libssh2-1.4.1_1
+libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
 libsnmp.so.40 libnet-snmp-5.9_1
 libnetsnmp.so.40 libnet-snmp-5.9_1
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8ec8d82505c023ba805a27987bc930825202654f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 153/460] libstrophe: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libstrophe/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6137c67d370..f190fe4cf38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1790,7 +1790,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From bc41b593ddc79f44f0120419cb68bc81414c82eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 154/460] libtd: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f190fe4cf38..f44b9f76ba8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3852,7 +3852,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From d7a5cb014f0f31933ed655e87ba93770ab68007e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/460] libtorrent: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libtorrent/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f44b9f76ba8..3dc834a5a51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,7 +819,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From c79d993e3608dd1eeb05d694c668af5d8a929391 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/460] libtorrent-rasterbar: rebuild against OpenSSL

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3dc834a5a51..295bf8965d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2004,7 +2004,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 934d08a56b9bce35e0dff902c6b95cde13abee47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/460] libu2f-host: rebuild against OpenSSL

---
 common/shlibs                | 2 +-
 srcpkgs/libu2f-host/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 295bf8965d4..a15b0b73706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2419,7 +2419,7 @@ libboinc_graphics2.so.7 boinc-nox-7.6.2_1
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 66aad0744efb8d3bed9b9ea157fca797909669a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 158/460] libu2f-server: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libu2f-server/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a15b0b73706..b4699ece480 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,7 +2420,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From e3e30cb98e15ca080d15ad4b98ae70fcbafb6822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 159/460] libucl: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/common/shlibs b/common/shlibs
index b4699ece480..2aa8b56ad30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1840,7 +1840,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 2fa634b8b03c56095daf235ca19d47dfc39150e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/460] libwebsockets: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libwebsockets/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2aa8b56ad30..c3111bb9ed9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2162,7 +2162,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From d066cea7bb0911ba1aaeb28f25b200915d560198 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/460] libzip: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libzip/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3111bb9ed9..70396a572bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1211,7 +1211,7 @@ libtinyxml.so.0 tinyxml-2.6.2_1
 libtinyxml2.so.8 tinyxml2-8.0.0_1
 libbluray.so.2 libbluray-1.0.0_1
 libnfs.so.13 libnfs-4.0.0_1
-libzip.so.5 libzip-1.2_1
+libzip.so.5 libzip-1.7.3_2
 libluajit-5.1.so.2 LuaJIT-2.0.0_1
 libOSMesa.so.8 libOSMesa-9.1_1
 libtaginfo.so.1 libtaginfo-0.1.3_1
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 45422acf9e5975d00539aca94e933a13fd8645e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/460] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 7c648cc8310e4d4f322701501d34571dfe28915c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 163/460] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From b992a748ef6bc8c2702e5cfef68a774a3617a4ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 164/460] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From e3fe9618c0b48779a94190272367a8c08642ef95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/460] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ee9d08abbfbb1d65d51ef73b8a6f6bafd129885b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/460] live555: rebuild against OpenSSL

---
 common/shlibs            | 8 ++++----
 srcpkgs/live555/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 70396a572bc..a6653680b71 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2963,10 +2963,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From aa7a88d0813e78118d11d31c0a7507e0b2a39b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/460] loudmouth: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/loudmouth/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6653680b71..ba1a05c801e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2003,7 +2003,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9e2e763fd912a760b0c6d7fe684a4f7c42e3bab0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/460] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 39993ef47ae2fa5ae88d726f27f40957dd965c55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/460] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 243ada37a8b09e0b3dd9c204b02b1eb63f2c7aaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/460] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From fdadc3efcc4cb904979412dd5c1f77e9adf04901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/460] mariadb: rebuild against OpenSSL

---
 common/shlibs            | 6 +++---
 srcpkgs/mariadb/template | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ba1a05c801e..173ef43e85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libecpg.so.6 postgresql-libs-8.4.2_1
 libpgtypes.so.3 postgresql-libs-8.4.2_1
 libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
-libmysqlclient.so.18 libmariadbclient-10.1.47_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
+libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -1583,7 +1583,7 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
+libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From ca498d492e45e4b631d49d4fce92142594e6e617 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/460] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 1c24852f52dc966238f5e9746179aacb921dce59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/460] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 316dbe1291f700803976836f83538a793770946a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/460] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 2021b4696da45a89e77b7e2834c598a5b727b2c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/460] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From d2b4513c41b9659e0c7bdef20c83876654651607 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/460] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 052f66c6404cd0da4f0bf3c1209b8c59a220cab3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/460] mit-krb5: rebuild against OpenSSL

---
 common/shlibs             | 24 ++++++++++++------------
 srcpkgs/mit-krb5/template |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 173ef43e85b..86648767605 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,18 +560,18 @@ libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
-libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
-libgssrpc.so.4 mit-krb5-libs-1.8_1
-libk5crypto.so.3 mit-krb5-libs-1.8_1
-libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.2_1
-libkadm5srv_mit.so.12 mit-krb5-libs-1.18.2_1
-libkdb5.so.10 mit-krb5-libs-1.18.2_1
-libkrb5.so.3 mit-krb5-libs-1.8_1
-libkrad.so.0 mit-krb5-libs-1.12.1_1
-libkrb5support.so.0 mit-krb5-libs-1.8_1
-libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
-libverto.so.0 mit-krb5-libs-1.8_1
-libverto-k5ev.so.0 mit-krb5-libs-1.8_1
+libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
+libgssrpc.so.4 mit-krb5-libs-1.18.3_2
+libk5crypto.so.3 mit-krb5-libs-1.18.3_2
+libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2
+libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2
+libkdb5.so.10 mit-krb5-libs-1.18.3_2
+libkrb5.so.3 mit-krb5-libs-1.18.3_2
+libkrad.so.0 mit-krb5-libs-1.18.3_2
+libkrb5support.so.0 mit-krb5-libs-1.18.3_2
+libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2
+libverto.so.0 mit-krb5-libs-1.18.3_2
+libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2
 libmenu-cache.so.3 menu-cache-1.0.0_1
 libupower-glib.so.3 libupower-glib3-0.99.3_1
 libcanberra.so.0 libcanberra-0.23_1
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From d6edaeaab42a40d03908a2e708fa47d6998269e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/460] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From b39962118aeb4225cd1b6bbf6cca81084b1c0190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/460] mongo-c-driver: rebuild against OpenSSL

---
 common/shlibs                   | 2 +-
 srcpkgs/mongo-c-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86648767605..a7f794d73e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3858,7 +3858,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 liburing.so.1 liburing-0.7_1
-libbson-1.0.so.0 libbson-1.17.0_1
+libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 8b39cee691afb9bc81e579a32804cb18c6524550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/460] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 03fd75b3443073d24709894fc433b211b606fde2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/460] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 961416de10bc6d7168dde538f6c5b9aa2b6bb011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/460] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From d6e39b7f731cb6bf9fd6b04775386aae3ac69302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/460] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 120e623785b6c9aca8c6d039ee5457029c706b78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/460] mosquitto: rebuild against OpenSSL

---
 common/shlibs              | 4 ++--
 srcpkgs/mosquitto/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7f794d73e3..a7b941c9fec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2116,8 +2116,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.1 mpv-0.8.0_2
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From d4cf9d893d4b9f996ea87aec0274589678098257 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/460] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c51d09b763b8fda5cc77c9b2080b68a1defbe871 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/460] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 14ab3e328517b6ebe9f9f41c43cd548c30654d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/460] mtxclient: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7b941c9fec..72bacd2baf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From 85de27eb80775df922ab15081622f68949522189 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/460] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From eb33bb88da56901ba72e5d56c2b6527b120c14d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/460] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 4fc012884629629c9cebf391b87a142192fbe923 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/460] munge: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/munge/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 72bacd2baf3..57da86ac3e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2496,7 +2496,7 @@ libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
 libaudiofile.so.1 audiofile-0.3.6_1
 libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.8 libmgba-0.8.1_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 72e73fac22a0e481e27f9b96e90575feae0ad414 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/460] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 728e8ed96e8e182611a0709bafe008cc225a51a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/460] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 2fb7412fc9fb3c1f88f647088462c61c2eafbcb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/460] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 220a288bb9135351aa76bf205c7ca5b0bef787b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/460] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 75718d4c0f7bc4a961ec9ed83fd8b3d067de89f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/460] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 97c6317821a9e730539b74cb7d011e8c6d9c47ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/460] neon: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/neon/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 57da86ac3e5..49f005001bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -754,7 +754,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 91af69553010de624a72d51dccaacc0c190f9cb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/460] net-snmp: rebuild against OpenSSL

---
 common/shlibs             | 12 ++++++------
 srcpkgs/net-snmp/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 49f005001bb..15614f839ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1063,12 +1063,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmpagent.so.40 libnet-snmp-5.9_1
-libnetsnmpmibs.so.40 libnet-snmp-5.9_1
-libnetsnmptrapd.so.40 libnet-snmp-5.9_1
-libnetsnmphelpers.so.40 libnet-snmp-5.9_1
+libsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmpagent.so.40 libnet-snmp-5.9_2
+libnetsnmpmibs.so.40 libnet-snmp-5.9_2
+libnetsnmptrapd.so.40 libnet-snmp-5.9_2
+libnetsnmphelpers.so.40 libnet-snmp-5.9_2
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From bce8213f262bb3041405fee0adf4b7d84b0525a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/460] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From c0cbd2aadcbe134f98ff5875899666970b01750b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/460] netpgp: rebuild against OpenSSL

---
 common/shlibs                                 |   4 +-
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 4 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/common/shlibs b/common/shlibs
index 15614f839ff..26adc4c8a9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -688,8 +688,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
 libmca_common_dstore.so.1 libopenmpi-4.0.1_1
 libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From ee65a6f19ecf7ca7c9cea80cf63855f2034781d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/460] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 0452183ab1444d43aba989625c9cf8d69176b2db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/460] network-ups-tools: rebuild against OpenSSL

---
 common/shlibs                                 |   6 +-
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/common/shlibs b/common/shlibs
index 26adc4c8a9e..e7474756396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1656,9 +1656,9 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
-libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
-libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
 libsphinxad.so.0 sphinxbase-0.8_1
 libsphinxbase.so.1 sphinxbase-0.8_1
 libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 2349815808f90a2cc043bab24f955de31d862c5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/460] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 31c850f326e26d6bd2cd95597d8765d8d8be70c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/460] nghttp2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/nghttp2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e7474756396..5ed762a8f57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2190,7 +2190,7 @@ libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
-libnghttp2.so.14 nghttp2-1.0.2_1
+libnghttp2.so.14 nghttp2-1.43.0_2
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 8ab77f0ad895066de17cc318047be87cdf18269a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/460] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7b0d2060cde8ceac82df35dfc4d0d5dab8c55e3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/460] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e5ed3f51d6013e6493b5ef3a92a30527cb3d24ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/460] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From a1e37d5f46f123e8e98415df38e7337a16496eac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/460] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 2f808b430db2e12361a2eef2d2a4c83e54bccc10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/460] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From ab91b8c4fda4aff5f86d0046cc77739ef7151d88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/460] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From fda9fb85b527f8877176ffad103eb0d90e34ee17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/460] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 4f7ea2ab243288fc16601ce3a7085c0bb00801fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/460] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 57aaea24790afeee0dc4bea05878e8cecbb92dd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/460] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 985618d24376d6b65d356c3f49b4ae57241d9ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/460] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From efe45cd1c43e02d260f76db5c233045b0cb55204 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/460] open-isns: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/open-isns/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5ed762a8f57..ebdf2d86924 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2790,7 +2790,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
 libKF5KrossCore.so.5 kross-5.26.0_1
 libKF5KrossUi.so.5 kross-5.36.0_1
 liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From f74ce0741739a27038f66a7345b191ec7ca4ffbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/460] opendkim: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 3 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/common/shlibs b/common/shlibs
index ebdf2d86924..627e5922023 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2664,7 +2664,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 17c1e4d2c4449263a44660cbb3efff13bd11c9eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/460] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From a69c69dce8314924d1266fde03bc72fd951ebee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/460] openldap: rebuild against OpenSSL

---
 common/shlibs             | 6 +++---
 srcpkgs/openldap/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 627e5922023..af8d19893fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -677,9 +677,9 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
 libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber-2.4.so.2 libldap-2.4.57_2
+libldap-2.4.so.2 libldap-2.4.57_2
+libldap_r-2.4.so.2 libldap-2.4.57_2
 libevent-2.1.so.7 libevent-2.1.12_2
 libevent_core-2.1.so.7 libevent-2.1.12_2
 libevent_extra-2.1.so.7 libevent-2.1.12_2
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 3b201b1a9a3931bd974e54da3a5a8e646b72a2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/460] opensc: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index af8d19893fa..05ecfc4ff8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1713,7 +1713,7 @@ libLinearMath.so.2.89 bullet-2.89_1
 libBulletSoftBody.so.2.89 bullet-2.89_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 0d89e010db7febbf5b80f9f75a46bc9b6b030ba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/460] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 298a90aa405071bd4b34dd6334c808b227f8c013 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/460] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 4098e21805e0f4794e12b2d3baa29ae24a77965b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/460] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 40af8322ac0f5807455f89487deaa24b7d0268c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/460] opkg: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/opkg/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 05ecfc4ff8a..b0d64c819b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3510,7 +3510,7 @@ libvkd3d.so.1 vkd3d-1.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From a02805c1a91de702f06c91bf8d6faf85f842450c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/460] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From c8939e97d071aa1b246b263f73333e8f6b029b36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/460] opusfile: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/opusfile/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b0d64c819b8..77f5ec4e9d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1201,8 +1201,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 01f762dd7cb423e74e9ac64c36552ed7aaa86651 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/460] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 7d5ba19e33ea370271b6dd12104382d10dcebae2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/460] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 46eab6a54991e466285f99be8ad78f98b14077dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/460] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 760c7561f595546c3a35e7598a0757e651a8f639 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/460] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From a2469f516f38d532ad11a8aa7d40016dbe0c36fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/460] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From cd911f4643c30a035efaeac7243916118b89c8f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/460] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 10463a2854ae7b23c29c894ec0d8ab7fa68d81f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/460] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 56be168cfb43f1f671013d4a93d9706d9bf69a5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/460] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 1f98a16d5d153e87b1120a6abb968c6ca5dfda57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/460] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From e7717de7d5e18ffd3d90c5d767ce4e92a3a2bb13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/460] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 2f8bdd441385cc2b0db08babbcf954f280a48a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/460] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From a743c67d79e692293d46015110376f309378a226 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/460] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 7128436526d81f75626c7c8b95df765aacee6af0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/460] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 3a8a20e3fe20e62b62f48606b7de4060cc1555f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 238/460] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 746be90f3ee7d5910e0c0e353ee80271b66a4fb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/460] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 26afa1d82ea9acab6fd264046e06a98fa00099fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/460] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From d35a7fcade55a8f80eadb54f902a786a99c2f488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/460] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From a94be0cde85f5e4255450f6621cd425b3269ca73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/460] pjproject: rebuild against OpenSSL

---
 common/shlibs              | 28 ++++++++++++++--------------
 srcpkgs/pjproject/template |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 77f5ec4e9d7..050af469a98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2465,20 +2465,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From bd562de481387c46746bb5475fa0891f0153513d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/460] pkcs11-helper: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/pkcs11-helper/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 050af469a98..8b3e2fdb551 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3085,7 +3085,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
 libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
 libr_cons.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From f47fc2d1a5c9d9faf06e2dc002b5f271a65e605c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/460] poco: rebuild against OpenSSL

---
 common/shlibs         | 26 +++++++++++++-------------
 srcpkgs/poco/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b3e2fdb551..a6a894c3874 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2926,19 +2926,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 2b96e8fb4250612e1d7f4ae87758470d490ccb19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/460] podofo: rebuild against OpenSSL

---
 common/shlibs           | 2 ++
 srcpkgs/podofo/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6a894c3874..2cf26d5a163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2518,6 +2518,8 @@ libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-5.0.4_1
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
+libseafile.so.0 seafile-libclient-7.0.10_2
+libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From bb7ebc046ed9107ced97b69059661bc0aa280975 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/460] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 2f44854ab5da23493e973a418f056b23dae09363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/460] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 343126f8933091f5fa02a9d17692cd8d34a3c28a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/460] postgresql13: rebuild against OpenSSL

---
 common/shlibs                 | 8 ++++----
 srcpkgs/postgresql13/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2cf26d5a163..e3f8216af1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -553,10 +553,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.2 pulseaudio-qt-1.1.0_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-8.4.2_1
-libecpg.so.6 postgresql-libs-8.4.2_1
-libpgtypes.so.3 postgresql-libs-8.4.2_1
-libpq.so.5 postgresql-libs-8.4.2_1
+libecpg_compat.so.3 postgresql-libs-13.2_2
+libecpg.so.6 postgresql-libs-13.2_2
+libpgtypes.so.3 postgresql-libs-13.2_2
+libpq.so.5 postgresql-libs-13.2_2
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From ec6185831f640305e9bf28b4a09df4b7526efead Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/460] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 38f478231d412033a84714e8f9a1ab9468d94de1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/460] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 823f37d17ef102e48098f1414caa580d8cbd42eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/460] pulseaudio: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/pulseaudio/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e3f8216af1b..6224bac7522 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -728,11 +728,11 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-1.0_1
-libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
-libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-14.2.so libpulseaudio-14.2_1
-libpulsecore-14.2.so libpulseaudio-14.2_1
+libpulse.so.0 libpulseaudio-14.2_2
+libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
+libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulsecommon-14.2.so libpulseaudio-14.2_2
+libpulsecore-14.2.so libpulseaudio-14.2_2
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 59524290dd3a72acee35662f0c8f5404d506d445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/460] python: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/python/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6224bac7522..d371e47a2f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
-libpython2.7.so.1.0 python-2.7_1
+libpython2.7.so.1.0 python-2.7.18_3
 libffi.so.7 libffi-3.3_1
 libffcall.so.0 ffcall-2.1_1
 libavcall.so.1 ffcall-2.1_1
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From e8f6987d14030bd595e03d79b68e8c62b6108677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/460] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fc538fc7dbfa2e5318083ffa36ba551652aaab05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/460] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From f98d621c44f510fc854c1c047caacd9dfcae4e9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/460] python3: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/python3/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d371e47a2f8..3b7f4056289 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1734,8 +1734,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.8.0_1
-libpython3.9.so.1.0 python3-3.9.0_1
+libpython3.so python3-3.9.2_2
+libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 02ce771f92e8bb1b3ea61bd7288a82db634d5f53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/460] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 06f7e851217899616034e17c8f3d982bcb9cf37b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/460] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 43f8dc91afad8dea4a1758a279731b1ca92ace7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/460] qca-qt5: rebuild against OpenSSL

---
 common/shlibs            | 10 ++++++++++
 srcpkgs/qca-qt5/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b7f4056289..d9d6ad7d847 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,6 +2176,16 @@ libclamunrar.so.9 clamav-0.101.0_1
 libclamunrar_iface.so.9 clamav-0.101.0_1
 libfreshclam.so.2 clamav-0.102.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 3f9207acaedb3707e2284097bffe08b46a77fda4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/460] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 54d872634572f3d06bfcd3aaab205421909e9d78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/460] qt5: rebuild against OpenSSL

---
 common/shlibs                                 | 154 +++----
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 3 files changed, 81 insertions(+), 503 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/common/shlibs b/common/shlibs
index d9d6ad7d847..f0a801eb276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1897,87 +1897,87 @@ libgltf-0.1.so.1 libgltf-0.1.0_1
 libabw-0.1.so.1 libabw-0.1.0_1
 libcmis-0.5.so.5 libcmis-0.5.0_1
 libcmis-c-0.5.so.5 libcmis-0.5.0_1
-libQt5Bluetooth.so.5 qt5-connectivity-5.15.0_1
-libQt53DAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DCore.so.5 qt5-3d-5.15.0_1
-libQt53DInput.so.5 qt5-3d-5.15.0_1
-libQt53DLogic.so.5 qt5-3d-5.15.0_1
-libQt53DRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuick.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt53DQuickRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuickScene2D.so.5 qt5-3d-5.15.0_1
-libQt53DExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt5Charts.so.5 qt5-charts-5.15.0_1
-libQt5DataVisualization.so.5 qt5-datavis3d-5.15.0_1
-libQt5Gamepad.so.5 qt5-gamepad-5.15.0_1
-libQt5Nfc.so.5 qt5-connectivity-5.15.0_1
+libQt5Bluetooth.so.5 qt5-connectivity-5.15.2_3
+libQt53DAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DCore.so.5 qt5-3d-5.15.2_3
+libQt53DInput.so.5 qt5-3d-5.15.2_3
+libQt53DLogic.so.5 qt5-3d-5.15.2_3
+libQt53DRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuick.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt53DQuickRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3
+libQt53DExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt5Charts.so.5 qt5-charts-5.15.2_3
+libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3
+libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3
+libQt5Nfc.so.5 qt5-connectivity-5.15.2_3
 libQt5WebView.so.5 qt5-webview-5.15.0_1
-libQt5Qml.so.5 qt5-declarative-5.15.0_1
-libQt5QmlDevTools.so.5 qt5-declarative-5.15.0_1
-libQt5Quick.so.5 qt5-declarative-5.15.0_1
-libQt5QuickTest.so.5 qt5-declarative-5.15.0_1
-libQt5QuickWidgets.so.5 qt5-declarative-5.15.0_1
-libQt5QuickParticles.so.5 qt5-declarative-5.15.0_1
-libQt5QuickShapes.so.5 qt5-declarative-5.15.0_1
-libQt5QmlModels.so.5 qt5-declarative-5.15.0_1
-libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.0_1
-libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Positioning.so.5 qt5-location-5.15.0_1
-libQt5Location.so.5 qt5-location-5.15.0_1
-libQt5PositioningQuick.so.5 qt5-location-5.15.0_1
-libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.0_1
-libQt5Multimedia.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.0_1
-libQt5NetworkAuth.so.5 qt5-networkauth-5.15.0_1
-libQt5Purchasing.so.5 qt5-purchasing-5.15.0_1
-libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.0_1
-libqgsttools_p.so.1 qt5-multimedia-5.15.0_1
-libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Scxml.so.5 qt5-scxml-5.15.0_1
-libQt5Script.so.5 qt5-script-5.15.0_1
-libQt5ScriptTools.so.5 qt5-script-5.15.0_1
-libQt5Sensors.so.5 qt5-sensors-5.15.0_1
-libQt5SerialBus.so.5 qt5-serialbus-5.15.0_1
-libQt5SerialPort.so.5 qt5-serialport-5.15.0_1
-libQt5Svg.so.5 qt5-svg-5.15.0_1
-libQt5CLucene.so.5 qt5-tools-5.15.0_1
-libQt5Help.so.5 qt5-tools-5.15.0_1
-libQt5Designer.so.5 qt5-tools-5.15.0_1
-libQt5DesignerComponents.so.5 qt5-tools-5.15.0_1
-libQt5WaylandClient.so.5 qt5-wayland-5.15.0_1
-libQt5WaylandCompositor.so.5 qt5-wayland-5.15.0_1
-libQt5WebChannel.so.5 qt5-webchannel-5.15.0_1
+libQt5Qml.so.5 qt5-declarative-5.15.2_3
+libQt5QmlDevTools.so.5 qt5-declarative-5.15.2_3
+libQt5Quick.so.5 qt5-declarative-5.15.2_3
+libQt5QuickTest.so.5 qt5-declarative-5.15.2_3
+libQt5QuickWidgets.so.5 qt5-declarative-5.15.2_3
+libQt5QuickParticles.so.5 qt5-declarative-5.15.2_3
+libQt5QuickShapes.so.5 qt5-declarative-5.15.2_3
+libQt5QmlModels.so.5 qt5-declarative-5.15.2_3
+libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.2_3
+libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Positioning.so.5 qt5-location-5.15.2_3
+libQt5Location.so.5 qt5-location-5.15.2_3
+libQt5PositioningQuick.so.5 qt5-location-5.15.2_3
+libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.2_3
+libQt5Multimedia.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.2_3
+libQt5NetworkAuth.so.5 qt5-networkauth-5.15.2_3
+libQt5Purchasing.so.5 qt5-purchasing-5.15.2_3
+libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.2_3
+libqgsttools_p.so.1 qt5-multimedia-5.15.2_3
+libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Scxml.so.5 qt5-scxml-5.15.2_3
+libQt5Script.so.5 qt5-script-5.15.2_3
+libQt5ScriptTools.so.5 qt5-script-5.15.2_3
+libQt5Sensors.so.5 qt5-sensors-5.15.2_3
+libQt5SerialBus.so.5 qt5-serialbus-5.15.2_3
+libQt5SerialPort.so.5 qt5-serialport-5.15.2_3
+libQt5Svg.so.5 qt5-svg-5.15.2_3
+libQt5CLucene.so.5 qt5-tools-5.15.2_3
+libQt5Help.so.5 qt5-tools-5.15.2_3
+libQt5Designer.so.5 qt5-tools-5.15.2_3
+libQt5DesignerComponents.so.5 qt5-tools-5.15.2_3
+libQt5WaylandClient.so.5 qt5-wayland-5.15.2_3
+libQt5WaylandCompositor.so.5 qt5-wayland-5.15.2_3
+libQt5WebChannel.so.5 qt5-webchannel-5.15.2_3
 libQt5WebEngineCore.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngine.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngineWidgets.so.5 qt5-webengine-5.15.0_1
-libQt5WebSockets.so.5 qt5-websockets-5.15.0_1
-libQt5X11Extras.so.5 qt5-x11extras-5.15.0_1
-libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.0_1
-libQt5Core.so.5 qt5-core-5.15.0_1
-libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5Network.so.5 qt5-network-5.15.0_1
-libQt5Sql.so.5 qt5-sql-5.15.0_1
-libQt5Xml.so.5 qt5-xml-5.15.0_1
-libQt5Gui.so.5 qt5-gui-5.15.0_1
-libQt5Widgets.so.5 qt5-widgets-5.15.0_1
-libQt5Test.so.5 qt5-test-5.15.0_1
-libQt5DBus.so.5 qt5-dbus-5.15.0_1
-libQt5Concurrent.so.5 qt5-concurrent-5.15.0_1
-libQt5OpenGL.so.5 qt5-opengl-5.15.0_1
-libQt5PrintSupport.so.5 qt5-printsupport-5.15.0_1
-libQt5XcbQpa.so.5 qt5-gui-5.15.0_1
-libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.0_1
-libQt5TextToSpeech.so.5 qt5-speech-5.15.0_1
-libQt5Bodymovin.so.5 qt5-lottie-5.15.0_1
+libQt5WebSockets.so.5 qt5-websockets-5.15.2_3
+libQt5X11Extras.so.5 qt5-x11extras-5.15.2_3
+libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.2_3
+libQt5Core.so.5 qt5-core-5.15.2_3
+libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5Network.so.5 qt5-network-5.15.2_3
+libQt5Sql.so.5 qt5-sql-5.15.2_3
+libQt5Xml.so.5 qt5-xml-5.15.2_3
+libQt5Gui.so.5 qt5-gui-5.15.2_3
+libQt5Widgets.so.5 qt5-widgets-5.15.2_3
+libQt5Test.so.5 qt5-test-5.15.2_3
+libQt5DBus.so.5 qt5-dbus-5.15.2_3
+libQt5Concurrent.so.5 qt5-concurrent-5.15.2_3
+libQt5OpenGL.so.5 qt5-opengl-5.15.2_3
+libQt5PrintSupport.so.5 qt5-printsupport-5.15.2_3
+libQt5XcbQpa.so.5 qt5-gui-5.15.2_3
+libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.2_3
+libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
+libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.192 x265-3.4_1
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 4ed40145dca939b7ca1e9c741f722211d2c42dbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/460] rabbitmq-c: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/rabbitmq-c/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f0a801eb276..241b56bc342 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 3c1548fa67397fd2012a3f5dfffb373017533499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/460] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 16e18659f8f825f63cb65469f9ff6ca8635874de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/460] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 47dc915fd5c746d8080c45f21b0767d6676b27c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/460] re: rebuild against OpenSSL

---
 common/shlibs       | 2 +-
 srcpkgs/re/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 241b56bc342..ea0d6b61b1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3387,7 +3387,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-0.5.8_1
+libre.so re-1.1.0_2
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 225f7739c021374dea670c84cd001661c75803e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/460] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 6256d686d979c7eb76bfd594828d552919bf8e31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/460] rhash: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/rhash/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ea0d6b61b1e..aedbdb898bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2932,7 +2932,7 @@ libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
-librhash.so.0 rhash-1.3.4_1
+librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 53b973517c7955100319bd99f73d9469366dc634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/460] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From c0089420111ad16dc024dae2c10cd22410aa7dfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/460] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From fbec1e9118ee766735f07aedcf2592afcd754934 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/460] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 7e33f565a89367108593c0daf8fe13e6a269d424 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/460] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 093afa78129fc76a3a050c88d07d8c2e673f1c38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/460] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From c9b650f96b505279f067a41002cfebf7c53c3fb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/460] rtmpdump: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/rtmpdump/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aedbdb898bf..69fc52c05a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1081,7 +1081,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 35dd155f44b638c931c4eeeabb051e17ce7a9eb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/460] ruby: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ruby/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69fc52c05a8..bf59e9a46a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -435,7 +435,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.1_1
+libruby.so.2.7 ruby-2.7.2_3
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 54e2ca9652b56cef56f35e9a4cd0a18cec185f42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/460] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From f371ee093f0d246f0761c3584ffe479b7287b232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/460] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 6bb1d00dda638efe1a643691ed92efa60a8af4fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/460] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 8682b0739699ed7a4091ee19e967ec0ae60718ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/460] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 692eb46f2132ed1e3088112ce4b604639b693754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/460] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 14981d824004ef90772a256d724c98411302b04c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/460] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 4111213409e9157714ef475e5701f55865ec9bc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/460] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e4ec99cd493874f3a4b01ed75c75b61156240a5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/460] seafile-libclient: rebuild against OpenSSL

---
 common/shlibs                      | 2 +-
 srcpkgs/seafile-libclient/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bf59e9a46a6..5bfa9fe8223 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2526,7 +2526,7 @@ libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_2
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 03fb31cee93b52747ff70eeb7d854921ef2c45de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/460] serf: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/serf/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bfa9fe8223..2862f68f10d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1414,7 +1414,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 2e07ce763ad7635c6ee86e23f41963e2518282ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/460] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From dc8aa3c3a1d42071c244fe96335bb5d8224212d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/460] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 691841a16560a0af5449e3a530ee40a78c33523a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/460] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 2d1265006ed619ac5d344ff2e1e0abfd73b7d94a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/460] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From bebaf87ac62b7cb059bfc458143a517deb861fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/460] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From f8c94b29c2edf3d9c8cc25578a62e75d4ddd16af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/460] spice: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/spice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2862f68f10d..c02a6ba7aa2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -783,7 +783,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From af1f4ca7aa86c2e1f8fe0d88e14bd164a5749400 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/460] spice-gtk: rebuild against OpenSSL

---
 common/shlibs              | 6 +++---
 srcpkgs/spice-gtk/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c02a6ba7aa2..d60be99503b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1167,9 +1167,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From e5ebb46becca46bae149d7a49f6684f83844bacb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/460] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e4c591e1685c0f0b593917cdaf451508f6ce2d77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/460] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 3c31c89ee95bc21e1503f10c1dceff3bd1b0efea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/460] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 6c72120c3b0a7c0db07ebad3e140245cd2c5c33c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/460] sqlcipher: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/sqlcipher/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60be99503b..6003344112d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2431,7 +2431,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From f5ec18118cdc7f1edf721b3811133a5e334e97c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/460] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 3d8683578dcecddf247cf77113081a076fb844d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/460] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 9e6ca2e39019771b306be0969eebf60fa334acdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/460] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 818a30395ce53701fb3b7a94ebb230cd217a0128 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/460] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 623a637f0e08b07761703e25b019fdd5381f30a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/460] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 60122059b56567be901a0ee44d6fa0e0cbcf4f11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/460] swi-prolog: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/swi-prolog/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6003344112d..c0f3b80bd27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2820,7 +2820,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d89154a3cd52f9cac6aa28a708e3fb8a05e8a9ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/460] swiften: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/swiften/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c0f3b80bd27..774457976aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2546,7 +2546,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From e7db2a792da28e46c1066bac5342dc8ee42a9251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/460] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 5b0872a4ca035207cf7ff40395cd45cef8755c55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/460] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From adfadc0d77659ed2eb8de9a18a5e578ee9a60251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/460] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 6dd71a07c571ba9327d54b0f3d22296b54cc4910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/460] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From bdaca01084d11325582d0846b3e338dcffe4e5a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/460] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 537dc564f7b6f474dbe03fd80275695873d3cbf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/460] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From f6dc66624c72087d78c8c80cde74f2963ae815f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/460] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0a4384886cbb50e64f81b1be6ca5c8c63c0ceaf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/460] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 4e8e4ca5ac30e90f3a7d32cd9e8124746e84cf0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/460] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From ff23b98a417d8cc55286cb92d74b304fe64cf073 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/460] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 0f7dabe5d85739148a52d3e05bd7ad725dbd56c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/460] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 6d4c1e44539ec5dcadd2936ca9ccce0f54652f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/460] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2955de782bb76d86526959e437a8538fa2485fa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/460] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 7b50ae3334ab667a793a5eaabc0821aca8c3e58f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/460] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e31ace04539b4e7d12fcdc31edeb082a6f96d8b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/460] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 483d601faad0a8055614bd13a1634f0747277d6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/460] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From f2415d3032aec1502ef2192a295a4f158e8e8ae2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/460] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 350989da91350dab3e67700c03ddd0ae8245f53b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/460] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 17e1ca1d8476914291d8d4483e6a46d737a355ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/460] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From f0e69c821864c7083a58fbe202103db97e436afe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/460] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 681457a1750e603d2183bae02d00c6e9d1ca6548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/460] trousers: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/trousers/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 774457976aa..316410afd23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2499,7 +2499,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 2a3269aa959a6a52c35183da7301f4eeeb2632cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/460] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 778b7f3ac32de92ed7c016ef4d46c388db3be859 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/460] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 8bce957be418578e4953b608d238bf114ea13f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/460] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From e8fdd6703bf5671854a6ecc9e0b42e66d3717357 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/460] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From b129ded1f8655cb26aad7342342aed8bc54fdf92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/460] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From cbdefc578d86a652be31c65b46388ab5b5900104 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/460] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From f82ef86b8e0719f109107f676732879bc96d1e22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/460] unbound: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/unbound/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 316410afd23..ff81c10815f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
 libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From c6d1c0281c02a7367f85fbf5d4b5e787c5859049 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/460] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 2c02acf8828e92cd52e4d478be83bc48692d56b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/460] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From eeb421774ef11cd3bfc6ae3b9623d5e4bed4f37b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/460] vde2: rebuild against OpenSSL

---
 common/shlibs         | 8 ++++----
 srcpkgs/vde2/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ff81c10815f..b8215da073e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1089,10 +1089,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
 libxbps.so.5 libxbps-0.59_1
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 05bdec129ee8151480f79a1fd8e6ae7750cc54bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/460] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From 20a76631dde5fd89dea6e7ec984df62696575cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/460] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From b40ed90e1cde137ccc52ad7f8e91984843077b40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/460] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 41001169153905891ea9e542a25a591ab9cf1bcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/460] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b2321d7b882aa75602493217c2f66228ca54946f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/460] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 9938c944d2f6c8bc4a06473187d0bf7d92fead75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/460] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From f0832019fd8b9c7498f6769f3cd6fbfb16b00407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/460] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From d4b6819bf5d95826abe28db62a0a7f3ba67b3ef7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/460] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 72a8e182dc2c3b5689db7ed9bc186b580740ec8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/460] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 1f5996d49314c8ffe806980b0ff3e246381f63e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/460] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 57fc3b9b9063ae64533fb412e0709d94a54ed293 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/460] wvstreams: rebuild against OpenSSL

---
 common/shlibs              | 8 ++++----
 srcpkgs/wvstreams/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b8215da073e..ffb1ecbfa66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2076,10 +2076,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From fe22a7f8aa42545d80a272d707ea1f4477ebb285 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/460] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 602958e6be3d7f9695181dabcba09aa90a3144d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/460] xar: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/xar/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffb1ecbfa66..326c7d1b95e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1096,7 +1096,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 06c5c5ffb516b011bfaab9338303d1795ebeb7d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/460] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 24aa495746c42c8cffa9500507c83116393d4c16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/460] xbps: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/xbps/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 326c7d1b95e..8ea49a59d9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1086,7 +1086,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
 libminiupnpc.so.17 miniupnpc-2.1_1
-libxbps.so.5 libxbps-0.59_1
+libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
 libvdeplug.so.3 libvde2-2.3.2_23
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 6504157b492b08a1534e34dd959db45993ae32ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/460] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 76e4f40aaaf760e3a8852d0632b0e8ce844136ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/460] xmlsec1: rebuild against OpenSSL

---
 common/shlibs            | 10 +++++-----
 srcpkgs/xmlsec1/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ea49a59d9a..d8a50fbafa3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1535,9 +1535,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1726,8 +1726,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From aa033981cd0acefee60aa4331bf6442423155b6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/460] yara: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8a50fbafa3..441eb89c0fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2970,7 +2970,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 0135216b434d7d68b2f8a0a8f1c792b35786b0d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/460] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From ee7772f26936d125ac8d1b34526535b6d1a9449f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/460] yubico-piv-tool: rebuild against OpenSSL

---
 common/shlibs                    | 4 ++--
 srcpkgs/yubico-piv-tool/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 441eb89c0fb..ab61f1e265a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,8 +3120,8 @@ libr_crypto.so.5.0.0 radare2-5.0.0_1
 libr_fs.so.5.0.0 radare2-5.0.0_1
 libr_magic.so.5.0.0 radare2-5.0.0_1
 libr_reg.so.5.0.0 radare2-5.0.0_1
-libykpiv.so.1 libykpiv-1.5.0_1
-libykcs11.so.1 libykcs11-1.5.0_1
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 0878783878363f26d678fc7376398c2435a664a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/460] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 70404b9580cca8f2b8bcf0da683034ac52fa1433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/460] zchunk: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/zchunk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ab61f1e265a..9cce0be6e16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 76f8ae8414039c0c453c8aa8dd0ed7ce03f529b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/460] zeek: rebuild against OpenSSL

---
 common/shlibs         | 10 +++++-----
 srcpkgs/zeek/template |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9cce0be6e16..aa6e54e9180 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3506,11 +3506,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 1924da88060c74bc989933e00a05f470faeaf2e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 355/460] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 6e2be4b0853a14369793bf875eea2bdfc748971c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 356/460] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 328ad3b58f9fa11bda49ba19aa75d01ce6df5ba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/460] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 490ac004abeb355610deb1aa2732f0e6732e21d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/460] c-client: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/common/shlibs b/common/shlibs
index aa6e54e9180..a6ea82d1f12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2365,7 +2365,7 @@ libdwarf.so.1 libdwarf-20160613_1
 libmemcached.so.11 libmemcached-1.0.18_1
 libhashkit.so.2 libmemcached-1.0.18_1
 libmemcachedutil.so.2 libmemcached-1.0.18_1
-libc-client.so.1 c-client-2007f_1
+libc-client.so.1 c-client-2007f_4
 libonig.so.5 oniguruma-6.8.1_1
 liblo10k1.so.0 alsa-tools-1.0.29_1
 libgflags.so.2.2 gflags-2.1.2_1
diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..bf65dc7277b 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From a84c5ab6703492b54729b981fd0093a349544c8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/460] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 8154d01f2c83fce75c1acf4141a8475bd446e7e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/460] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 00eadc375d3aa0cf1868cc0605cd92a9cc865c57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/460] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..e2fb62b08d8 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From b037bcc603345ca44acad359565ab698174d40b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/460] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 050241f7f2880c847685ae54849b68253dabf09c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/460] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 5849e38e63cc229a584ede94ab215c30f63e87e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/460] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 7851a9963a7e890be0f4b5f4c34f3889409c7f53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/460] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 2dbee9f71705a7a786ea975f3fe125e7195e8123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/460] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From b673d612def340c1ae24fe85e49d3adb4119a331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/460] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 4934b0153595f00e50911cd46803bf13020a272b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/460] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 05b58d119a915bba4cc077f674710ec8ca1acb04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/460] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b5b699ce139b9e5eb08158bc11d67bb3cf72baad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/460] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From a7eecaeb2613592ba3d397d317401fa42d252d71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/460] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 6e1ae2e3ace5ea62365c31f5c81602f598d0abf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/460] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From e38243c8a491624e8c3d58ef667c5fcd4ab10ffa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/460] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 710abcf30be190a136b434a1cd9e1c6f86a46c9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/460] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 096caf4c5b7c36375fe7111086da38e8b9cbaf7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 375/460] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 268abcf5e3a369ac438e6353ffe9956129e836ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 376/460] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From af0a3b4347c4cce979e65fb9ae564a5442b85fa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/460] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 0b13be3eafaa0eb69fbaac122818ada1c48973c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/460] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From 05c4e40589efcaa19635317323db3d5118c70025 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/460] libvncserver: rebuild against OpenSSL

---
 common/shlibs                 | 4 ++--
 srcpkgs/libvncserver/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6ea82d1f12..0476aee0fa5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1381,8 +1381,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 33e6f9aa92fb945882daf04cd307759c5f7dcaf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/460] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From b187e99d5eb7209da3fa40abde1cb6e342b79ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/460] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 4a99ca8e8ccde4ff41dc646c03d3f73d867bf596 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/460] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 43415889b7d1bb4d366b955a9a7be2cf0fe84ea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/460] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index 0476aee0fa5..d8abe9689f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -579,7 +579,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From c33d604afcdf7fafbcb02082d0a45499d060765d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/460] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 1b524eab19180a6d25aa5a55fb859ef9b969a782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/460] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 1e7d77cfdd8e216e0d5d1604950be90ce648a92b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/460] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 054083d960105129938d97e17e4a353062937639 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/460] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 432dfe4feb2a503bbfef112a2a7dc4a23f7cb190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/460] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 29f5bbfd5a001df7b26f727df896dd9b6b6de6c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/460] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 7451d4859a81b8087682fc3ff7d5eac6f67532f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/460] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 0781a2c14a04ac85b405a79d6ed0f9a1915a156b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/460] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From b00d44e0bc55b193fdc100df1d4dfa696c39ef7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/460] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 664a6f334ece1af59b0a6b8249d36c21342400c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/460] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 3b36764a74e3d9154b2fd76854da0943ad49e247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/460] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 6039ca08dd83be976193d19c2e76bcab2bd0935d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/460] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From 7d9b2614a4e2e398f3156b9c54b98405007c6875 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/460] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c11c6c4e11f3c533ee82dfbdc5986c053aae84ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/460] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 5e94443492c0df2fa53ac9862402727ad8dd849f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/460] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 8988f109516ad42d07904cf23779b686ff6553ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/460] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e6af57723da8952f8caf32eb5f4e3cd807e954f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/460] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From a499fcb33dff50396ef5c0b162300b242b782409 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/460] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 9c8e544d0b8e0ed27771172a1d5efbc1808a3e78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/460] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 974ffbff5e185bd986de05652605ffa3de7d28b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 403/460] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 947208c4d1c3e41ce4ff838af559b591ce1ffa92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 404/460] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 4457e5b28abd5aee835c28bb44767f0d395b2aca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 405/460] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 4e59ccf81ca15ff220314b870e52ba970ddc1c9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 406/460] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From e84e1ad01ce3e94dece4d12377ad91de6b3e3466 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 407/460] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 11b0b71840e88322742c07e1e2693331436d6b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 408/460] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From b4cd35e73057975ce17f9b351e54173447df99e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 409/460] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From 35fce754c0d4d6406b928327cb60240e8d57a700 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 410/460] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 422fe4e4a2270f81b76e384c710829f57121d836 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 411/460] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From d01e0552adb3b107ee9b227552833d975f5f0b2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 412/460] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b4bec204d017c0b5b37df38fd892cf366ab5c4e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 413/460] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 9f6c0c11c29aef06cb8a01088292d4232d42eeb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 414/460] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac8471825c36fe76361435d9745356ce83d84f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 415/460] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 35167eb97c8e80a95bfc8250d1fd6cc7320bf952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 416/460] xen: rebuild against OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From f7c8d34ccfa0cdd33b012790bf40670ea244be29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 417/460] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 3e64e880d80abba0f8729f7d9896a598e9464826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 418/460] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 53ec9ce864d61be764cfb59b784e9688a1228160 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 419/460] boinc: rebuild against OpenSSL

---
 common/shlibs          | 12 ++++++------
 srcpkgs/boinc/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8abe9689f6..c70bb21a258 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,12 +2420,12 @@ libcsound64.so.6.0 csound-6.05.0_1
 libcsnd6.so.6.0 csound-6.05.0_1
 libfko.so.3 libfko-2.6.9_1
 libvterm.so.0 libvterm-0.0.20151005_1
-libboinc_opencl.so.7 boinc-7.6.2_1
-libboinc_api.so.7 boinc-7.6.2_1
-libboinc_graphics2.so.7 boinc-7.6.2_1
-libboinc_opencl.so.7 boinc-nox-7.6.2_1
-libboinc_api.so.7 boinc-nox-7.6.2_1
-libboinc_graphics2.so.7 boinc-nox-7.6.2_1
+libboinc_opencl.so.7 boinc-7.16.16_2
+libboinc_api.so.7 boinc-7.16.16_2
+libboinc_graphics2.so.7 boinc-7.16.16_2
+libboinc_opencl.so.7 boinc-nox-7.16.16_2
+libboinc_api.so.7 boinc-nox-7.16.16_2
+libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From b7b16becc8bdbef003d3220cd9bd8420de2b8ead Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 420/460] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 8da3e2c17ecc00d2e7134ef3f5298642d31c1c1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/460] clamav: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/clamav/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c70bb21a258..e077692a149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2171,10 +2171,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.101.0_1
-libclamunrar.so.9 clamav-0.101.0_1
-libclamunrar_iface.so.9 clamav-0.101.0_1
-libfreshclam.so.2 clamav-0.102.0_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 179e634b2dbeae0bb49b4056c9700d2e483c591d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 422/460] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 619c503ab59d9b7410898fc3a35d4a5fb30e5ddc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/460] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 040739fea3616a013d99e59f6f396cf8fc2b02df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 424/460] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 1cecb097b03c1306c6ae7130e89d08fd9bd2d0d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/460] libgdal: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgdal/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e077692a149..234646579ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2433,7 +2433,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 4751321860af3bfc242612f9be1351c34335b417 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 426/460] lxc: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/lxc/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 234646579ef..6f07ec34677 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1539,7 +1539,7 @@ libxmlsec1.so.1 xmlsec1-1.2.31_2
 libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
 libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From cbbebb487e9b7a438d489c3cb6441af59285645f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/460] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 44e83b71da5f8957231730679af0e70f4a604bb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/460] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From ee9cfbf1813821092a84b464dcf1fc79da5cdfa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/460] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From aa6e1693a24c8caff77c3aa2cb7a4821b8c51523 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 430/460] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From af895b0ec8f214dbb40e39270a2590484b1816d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/460] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From eb740a2697372214e45923428f05bf1b84b3c121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 432/460] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From ccc238cd52709d74430adb9fe679120ca268e142 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/460] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 7b0f9e5e9cbc84253ab0825325d1393c359e8dfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/460] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 4410440d2f5961efa7898416dd80b98def0af592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 435/460] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From fbf05ac7bf7a1dece7a04a9f889d513d1e2dbdf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/460] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 93b7a8c0d0ef68a77824c6cbdcc127342b8c5468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/460] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From cf3aca6ed1b7c06a520599b97be8f50e15fce502 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/460] sssd: rebuild against OpenSSL

---
 common/shlibs         | 18 +++++++++---------
 srcpkgs/sssd/template |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6f07ec34677..c2e8e4eaec1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2686,15 +2686,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From fe00a1cab76497dfc9cf91698510a061fa1cf559 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 439/460] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 761498987a82a7e8504696545a826464fe98e1c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 440/460] xmlrpc-c: rebuild against OpenSSL

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/xmlrpc-c/template |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2e8e4eaec1..dfbbd9cba30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1738,22 +1738,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From f3fd063e4f499b78b8934334b080a0ff7394279f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/460] zfs: rebuild against OpenSSL

---
 common/shlibs        | 12 ++++++------
 srcpkgs/zfs/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dfbbd9cba30..f1f80201e6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3789,12 +3789,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From af74e1228f312c0afb4fbfbb1386f7432ed2f68d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 442/460] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 3c451d0aefcd246fc87cd5649613042361f9b5bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 443/460] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 234c6c8a5b93f7280cf2649c19ff4760d1304e1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 444/460] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 1269e5e39b3d762d9267d0e393d7e1b297cd139f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/460] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From db6eb6902db651390a6f1c22a580d33a9b9b8ec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/460] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 26cd3c93fcd8613e2fc9922035882725511871b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/460] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From dda259210e19f27db23bc0a498d7a73b13110956 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 448/460] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 24141bf567de2782fe1b2bf92bb6842ac97ba34b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 449/460] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a8a42aa0a3..ed7e812aab8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 7a5b78d7e1bac791ac56b275c6e5efbd46bef1c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 450/460] Ice: rebuild against OpenSSL

---
 common/shlibs        | 32 ++++++++++++++++----------------
 srcpkgs/Ice/template |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f1f80201e6d..b24e4c54a6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,22 +961,22 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.8 kdecoration-5.21.0_1
-libGlacier2.so.37 libIce-3.7.5_1
-libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
-libIce.so.37 libIce-3.7.5_1
-libIceSSL.so.37 libIce-3.7.5_1
-libIceUtil.so.37 libIce-3.7.5_1
-libIceStormService.so.37 libIce-3.7.5_1
-libIceStorm.so.37 libIce-3.7.5_1
-libFreeze.so.37 libIce-3.7.5_1
-libSlice.so.37 libIce-3.7.5_1
-libIceBox.so.37 libIce-3.7.5_1
-libIceGrid.so.37 libIce-3.7.5_1
-libIcePatch2.so.37 libIce-3.7.5_1
-libIceDB.so.37 libIce-3.7.5_1
-libIceXML.so.37 libIce-3.7.5_1
-libIceDiscovery.so.37 libIce-3.7.5_1
-libIceLocatorDiscovery.so.37 libIce-3.7.5_1
+libGlacier2.so.37 libIce-3.7.5_2
+libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2
+libIce.so.37 libIce-3.7.5_2
+libIceSSL.so.37 libIce-3.7.5_2
+libIceUtil.so.37 libIce-3.7.5_2
+libIceStormService.so.37 libIce-3.7.5_2
+libIceStorm.so.37 libIce-3.7.5_2
+libFreeze.so.37 libIce-3.7.5_2
+libSlice.so.37 libIce-3.7.5_2
+libIceBox.so.37 libIce-3.7.5_2
+libIceGrid.so.37 libIce-3.7.5_2
+libIcePatch2.so.37 libIce-3.7.5_2
+libIceDB.so.37 libIce-3.7.5_2
+libIceXML.so.37 libIce-3.7.5_2
+libIceDiscovery.so.37 libIce-3.7.5_2
+libIceLocatorDiscovery.so.37 libIce-3.7.5_2
 libkdecorations2private.so.8 kdecoration-5.20.90_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From b6881331e8fa213ca80f97aa1caf4e60f4147708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 451/460] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 796d40f43aa8ca856e6b7042c8bd4c1d67ec0b18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 452/460] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 5af73e336be12a0feb308095562734a9f913d938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 453/460] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4fdf8506126b1ad42d73733b5172145e8ca7dbac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 454/460] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d34ea04f5d9653ee47107f56e1f75fa92607a23d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 455/460] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From f263ed648e6312e01387131b03fd31c28976c966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 456/460] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From 8b808e2897221eb2aee290b20aa4bde4220b3bd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/460] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc..fbf723826ac 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.178
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c95c02ce8ef0ae6d263c7eb1abbcdaae9ffd8608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/460] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e7301a46457483da6ad867afb7ab627edea885bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 459/460] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d..8944092048b 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.102
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 8e9215d66a3d988c83a684c3933814557ca92fb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 460/460] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e4..0ff0fdd4706 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 680547 bytes --]

From 41af3c3a2509e2a487aeaf398d30153f09691f20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/460] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 9fccf0e3149ccb95252b8d747e0a138859155144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 002/460] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..fdd5986a740 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From d97139ba597955428b7e79cda81018ad6bc7472c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 003/460] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..95c48dbe8cd 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From bba239af93c3801c6e2fed96dfc0feb74e5071bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 004/460] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..f62a206c1fd 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From ce27baadd72607a2d4bd20170e9ecf7be681e8cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 005/460] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..b394a98c10b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From 15e5b1cc6c7f1832f7329c48af4034b2729b6e28 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 006/460] New package: libtls-3.2.4

Move libressl-nc to this package.
---
 common/shlibs                                 |  2 +-
 srcpkgs/libressl-netcat                       |  2 +-
 srcpkgs/libressl/template                     | 13 +--
 srcpkgs/libtls-devel                          |  1 +
 .../fail-instead-of-trying-fallback.patch     | 21 ++++
 srcpkgs/libtls/template                       | 98 +++++++++++++++++++
 srcpkgs/libtls/update                         |  1 +
 7 files changed, 124 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/common/shlibs b/common/shlibs
index c836cc1a377..dff7be03a35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ 	 * sysctl ABI, or consider providing a new failsafe API which
+ 	 * works in a chroot or when file descriptors are exhausted.
+ 	 */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ 	raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+	: #	./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	# Use CA file from ca-certificates instead.
+	#rm -f ${DESTDIR}/etc/ssl/cert.pem
+	#ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From e323b09bf884eb6f2ba5e79fe140317f696d2add Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 007/460] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 9a9a6423a3e0208268cf6ae59edad5cbd39110ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 008/460] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 62d69f86b9d92979c92b7e8987aaeecb7273606a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 009/460] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 3640c8e90b1e673f3566c0d391a81fb13443bf16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 010/460] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f176a955cc147c121484ebfd777aeb313023f9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 011/460] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From c554741c2a5caaa03eb18906ac588186cd62e923 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 012/460] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index dff7be03a35..305041c8e5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From c5e0dd05c5cc531a1a2f21531bf86672fc9036f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 013/460] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 305041c8e5a..5bdb4175c62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From d42aefbcf4c96adc3ac4aea1f529b8c01a674d53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 014/460] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..854e76a613c 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 07f8c72ae3f38ba205e21c29801e383b92a16f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 015/460] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From e1863466a6de25344e855cb19815a9d8ca75f1e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 016/460] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 87fcad8c6791fdf30f9df131b2b66870d2cdcad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/460] MEGAsdk: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/MEGAsdk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bdb4175c62..1375f975e42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3058,7 +3058,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30703 MEGAsdk-3.7.3c_1
+libmega.so.30703 MEGAsdk-3.7.3c_2
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 4f759e9a016e31b8fc5132cc9d21849317e54cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/460] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From a7be6f27bca2c8b90f6565d165634b26883c9807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 019/460] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From a4067629d162b62c1d9fd89115b68a4e502236fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 020/460] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d0362ce4b494338650f47dd9ceeaa6e2c4193be4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/460] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From c33433d1c7553b81297dfc5df0b5043dc5fb9441 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/460] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From dc0f0b53cf8ffe08db0dd3925a4824f330388cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 023/460] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 812d74b0c17df3201bf37e6f2b42fd9fac916738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 024/460] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e6ec606b11610edb1ce7aafb3dbdfc85f72fdae7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/460] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From ee4395b757b40b5308e89d9d405032af5516383f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 026/460] apr-util: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/apr-util/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1375f975e42..acfe3c2f32c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,7 +687,7 @@ libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
-libaprutil-1.so.0 apr-util-1.3.9_1
+libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From aea7fd4abb86be5ce4c78cc9c82635e8e565a43e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 027/460] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8867b8341a6a441ef4be954f794ba45d8bbaefe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/460] aria2: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/aria2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index acfe3c2f32c..b282e859076 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3073,7 +3073,7 @@ libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
 libzim.so.6 libzim-6.0.1_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
-libaria2.so.0 libaria2-1.33.1_3
+libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
 librpmsign.so.9 librpmsign-4.15.0_1
 librpmbuild.so.9 librpmbuild-4.15.0_1
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From d77ec6b3251aaf9a1997705fe251c7b6c087ac0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/460] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From bae3d4183bff0f394b01b7ef7a9deb5ecf5934d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/460] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 774d997070d87d1033916ce622f7135fc5e8fad9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 031/460] bacula-common: rebuild against OpenSSL

---
 common/shlibs                  | 20 ++++++++++----------
 srcpkgs/bacula-common/template |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b282e859076..21ee88dcd34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2943,16 +2943,16 @@ libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
-libbac-9.4.2.so bacula-common-9.4.2_1
-libbaccfg-9.4.2.so bacula-common-9.4.2_1
-libbacfind-9.4.2.so bacula-common-9.4.2_1
-libbacsql-9.4.2.so bacula-common-9.4.2_1
-libbaccats-9.4.2.so bacula-common-9.4.2_1
-libbacsd-9.4.2.so bacula-common-9.4.2_1
-libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_1
-libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_1
-libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_1
-bpipe-fd.so bacula-fd-9.0.4_1
+libbac-9.4.2.so bacula-common-9.4.2_4
+libbaccfg-9.4.2.so bacula-common-9.4.2_4
+libbacfind-9.4.2.so bacula-common-9.4.2_4
+libbacsql-9.4.2.so bacula-common-9.4.2_4
+libbaccats-9.4.2.so bacula-common-9.4.2_4
+libbacsd-9.4.2.so bacula-common-9.4.2_4
+libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_4
+libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_4
+libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_4
+bpipe-fd.so bacula-fd-9.4.2_4
 libnftables.so.1 libnftables-0.9.1_1
 libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From b95dda34f83e9122219a3f85f7d0cab5930fb598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 032/460] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From bc9d24f398d68c2477af1ad524ce9ea8bcb9625c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/460] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 87c1479512491c9a10959fa9e3328cf0eb3b2394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/460] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From ef93588c65f54d2d294917471ba6fe5f351823db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/460] bind: rebuild against OpenSSL

---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 21ee88dcd34..7dc94cccc2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1013,13 +1013,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.12.so bind-libs-9.16.12_1
-libdns-9.16.12.so bind-libs-9.16.12_1
-libirs-9.16.12.so bind-libs-9.16.12_1
-libisc-9.16.12.so bind-libs-9.16.12_1
-libisccc-9.16.12.so bind-libs-9.16.12_1
-libisccfg-9.16.12.so bind-libs-9.16.12_1
-libns-9.16.12.so bind-libs-9.16.12_1
+libbind9-9.16.12.so bind-libs-9.16.12_2
+libdns-9.16.12.so bind-libs-9.16.12_2
+libirs-9.16.12.so bind-libs-9.16.12_2
+libisc-9.16.12.so bind-libs-9.16.12_2
+libisccc-9.16.12.so bind-libs-9.16.12_2
+libisccfg-9.16.12.so bind-libs-9.16.12_2
+libns-9.16.12.so bind-libs-9.16.12_2
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 3a2e9e083d801b275375554ee1cc9de87d4f77a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 036/460] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From ef96ec11ba5a679bfce9d62851c23a033208f186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 037/460] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 8fa0ffb2fc7b6f65cb36db49db602d9332d855d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/460] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From fd4099bb4346bd166313011fa78baa6514a01862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/460] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From f2719e1b495a622e129a222ba55d7ef7c8c5c92b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 040/460] botan: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/botan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7dc94cccc2b..ccaa2340d0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2807,7 +2807,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_1
+libbotan-2.so.16 botan-2.16.0_3
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From eb12290df7c050766e3632601554761a04048b63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 041/460] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 3bdb31af498a1939a7c6176ec86a3eef1061c14c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/460] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From c79f2d879fe96f898d56a1298c97d09589d6cb62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 043/460] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 5d96096de365e28f1bd2d17a46d67e4eeb137514 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 044/460] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 1939324d1eed091e08ca3e239fa06e0eb5dd141e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/460] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From eccfc98d51489cb02446213e6dd34808acf09297 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/460] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 89350cbd47cdf2a9c3052d20a6dc83ee83e7690e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/460] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From fd8562600b7294b4917a2ab78d23101b40e05047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 048/460] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From bf0f1c215eb09659f79c5e8e5f8781c0dff0a3c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 049/460] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 4aa1fd8ca78835e4b6948aeb4e16cb30dfb1dcf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/460] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 1f23cbda3470a0483698ed95cee0586f068fd659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/460] cbang: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/cbang/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccaa2340d0f..5effa646a8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3806,7 +3806,7 @@ libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
-libcbang0.so cbang-1.3.3_1
+libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From d57e8efc8f9cce38bece235e33509babdc086738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 052/460] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 3cd7e674cacd1e18a552eb4b77ccaac8db7607a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 053/460] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 2400e39ec4a0f25359866c40adf3ba9f9a642c89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/460] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 5b5597024ec8d747e1d647745d62e93dcba0712f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 055/460] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 747cfa1f737d5d94333eb2c095a38ba9874b26e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 056/460] collectd: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/collectd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5effa646a8c..c086e27fe76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2362,7 +2362,7 @@ libgflags.so.2.2 gflags-2.1.2_1
 libgflags_nothreads.so.2.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
-libcollectdclient.so.1 libcollectdclient-5.5.0_1
+libcollectdclient.so.1 libcollectdclient-5.12.0_3
 libpinktrace_0.9.so.9 pinktrace-0.9.1_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From de43e1bcbf3985f3b7215de85a0c03f78465ec42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/460] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From a66c7ca49633a08581306fd75c9b399c7b087c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/460] cryptsetup: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/cryptsetup/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c086e27fe76..567208278e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1030,7 +1030,7 @@ libcss.so.0 libcss-0.1.1_1
 libhubbub.so.0 libhubbub-0.1.1_1
 liblutok.so.3 lutok-0.4_1
 libmtdev.so.1 mtdev-1.1.2_1
-libcryptsetup.so.12 libcryptsetup-2.0.0_1
+libcryptsetup.so.12 libcryptsetup-2.3.4_2
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From d200d2e745c33e16c9934f223a5b8c2e8a7a924a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/460] curl: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/curl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 567208278e7..fe04fc90149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -361,7 +361,7 @@ libfreebl3.so nss-3.12.4_1
 libnssdbm3.so nss-3.12.4_1
 libnssckbi.so nss-3.12.4_1
 libnss3.so nss-3.12.4_1
-libcurl.so.4 libcurl-7.19_1
+libcurl.so.4 libcurl-7.75.0_2
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From ee8bdbb9118f811699951e2ad8dc9de498ef5ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 060/460] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From c223f587a8531039e657cb7147aced296b568a79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 061/460] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From 69fbc51d5191f31ade8ca191e0ae160071f828ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/460] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From e9495c3365c58e7df8e3007b3030670770374efd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/460] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 38fcd56e6a05a1c33a9a4e0d7cac4a606a591483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/460] dovecot: rebuild against OpenSSL

---
 common/shlibs            | 12 ++++++------
 srcpkgs/dovecot/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe04fc90149..95d4b00d4ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,12 +1577,12 @@ libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
-libdovecot.so.0 dovecot-2.2.11_2
-libdovecot-login.so.0 dovecot-2.2.11_2
-libdovecot-compression.so.0 dovecot-2.2.11_2
-libdovecot-sql.so.0 dovecot-2.2.11_2
-libdovecot-storage.so.0 dovecot-2.2.11_2
-libdovecot-lda.so.0 dovecot-2.2.11_2
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
 libmysqld.so.18 libmariadbclient-5.5.36_1
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 2c33536fda246ee5bf294f33b6792e98672d035c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 065/460] dpdk: rebuild against OpenSSL

---
 common/shlibs         | 268 +++++++++++++++++++++---------------------
 srcpkgs/dpdk/template |   6 +-
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 95d4b00d4ce..37f0567c6ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3630,140 +3630,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 4dd5992a9feac88ace3ceb3fd583296f2ddeb3ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 066/460] ecryptfs-utils: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/common/shlibs b/common/shlibs
index 37f0567c6ef..0122864ce8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1094,7 +1094,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
 libvdehist.so.0 libvde2-2.3.2_1
 libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 5300ca4412a5685656b4325997133b04bdc052f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/460] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 20c98164d1511df21abb2047f9771469a25ad15f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/460] efl: rebuild against OpenSSL

---
 common/shlibs        | 78 ++++++++++++++++++++++----------------------
 srcpkgs/efl/template |  4 +--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0122864ce8c..8c7fc32ef9b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1460,42 +1460,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1855,9 +1855,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 14a1b371c58af7c4cb07e09e7a14497e9df67156 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/460] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From bc23b812211d24786b505be5a66d54606d8663b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 070/460] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 34b5ae34abde3304b3d9cc329c0ebcf51f0c78ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 071/460] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From da999853ab211202c09a675d9811940acc5ee1fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/460] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From fa86077f348abd3618338695abf65f64c47e6f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/460] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From df25e37f483e4fdb90310101bf92d1b7f4db3992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/460] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 8c18514340e8615eee6430f8bf4113cafd3f416e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 075/460] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 19d061f654c273eaf4f555fab7eebb31329fad79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 076/460] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From cbb65c7164339dd266f88ab99d3a5ce0b68fe583 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/460] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 022c6b05e72ddba92559496b286759c2e38818b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/460] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From 73bb4e22d68cb4d2889add97eeec0bfc1e3c3b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/460] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From a65a4b7c1567419e50ce6ea9b1cd205e730581a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 080/460] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From ae108af40847ffbba1ec7e1eeb794f4fedab95e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 081/460] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From f50909c51b99af850120b8ae467943a0ae603d48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/460] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From f0e0975008e88dc11c5dd7880089b361987a1acc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/460] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 9e68eb5e67812ecbb0b9788b6c21861cb6988fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/460] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 1063d4e5e7413bd8b1266a7b17f115f77999cdc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 085/460] freerdp: rebuild against OpenSSL

---
 common/shlibs            | 26 +++++++++++++-------------
 srcpkgs/freerdp/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c7fc32ef9b..6020e896a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1595,19 +1595,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
 libcppunit-1.14.so.0 libcppunit-1.14.0_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From d54652a9df9915505a17d96133bbe35886e94190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 086/460] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 5d58f61c056265a580211c8c21fa1cafa439150f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/460] gambit: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/gambit/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6020e896a29..5f6d1951d45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3611,7 +3611,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 00c09570165229e5961e1a4229b52a8ce55250af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/460] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 077856d54974952766b6a8c70c41b7c5f79f526d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 089/460] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From b6e584144fab8844c72f3650b97d448c251db60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 090/460] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 94e34988fe29be177a58850fc3e626316f6c7a79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/460] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 06e559cfb4d6132b81b15d9e6d1e78d038e4c3be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/460] getdns: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/getdns/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f6d1951d45..25d333c4959 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3482,10 +3482,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 3e99d9c5f6432b132d041b5a9c194a3dbcbecbc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/460] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From 5d338b8531817893d0500ecff3884fbeb2359d3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 094/460] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 275b0186906e7f6dea536b23c55cf7d0e9ceb4a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 095/460] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From a080a9087db9d8488877f2421f907011a30d1c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/460] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 1e801021a5ca6eedfc8606edaa5d0275c576e331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/460] glusterfs: rebuild against OpenSSL

---
 common/shlibs              | 14 +++++++-------
 srcpkgs/glusterfs/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 25d333c4959..74867352226 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1440,13 +1440,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From ea8bb6c82aa16e2eb5d9a91c990f05fe3c658a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 098/460] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From ea26d2ac263af56a846ad90c8255b14b39fc9e08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 099/460] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From d1ae18e3484380b91c0db17086d588119f3484bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/460] grpc: rebuild against OpenSSL

---
 common/shlibs         | 24 ++++++++++++------------
 srcpkgs/grpc/template |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 74867352226..aab880ea53b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,18 +3572,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..708cd5b6518 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=2
+revision=3
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From adc83bf4c8dc85aaa40e7649b1e25b900c21761d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/460] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 75be3aeda60a846c9d0db095cfd3d604af9d1226 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/460] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From bfb48c889bcd62dd092b63408e2548866e075109 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 103/460] gst-plugins-bad1: rebuild against OpenSSL

---
 common/shlibs                     | 12 ++++++------
 srcpkgs/gst-plugins-bad1/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aab880ea53b..15c74992708 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,12 +1133,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From c23dd56a59ad8a17d2054c847319ab5b53e662bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 104/460] gwenhywfar: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/gwenhywfar/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 15c74992708..82d25d61c60 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1524,11 +1524,11 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1
 libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 85be7373e8d8fb2054e0f01239fde50cf529e994 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/460] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f4d89fb92023d4a58ed923d8f2a12f89d7816f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/460] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 366265845a0b38ab12c6c43c6a361ba6c49e3657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/460] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From cc4fdc9fd663988c47847b37075a30dd5fcfb166 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 108/460] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From c6fd71c2973498d3d23ece60abdd1cbd5eafa5f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 109/460] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 822c91ed72ce5e46beeaa6b4fb9135efde7822fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/460] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From daa23f2e4e2b5195052e63d0b74d6d2b0524db47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/460] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From f13f0f8333d4d0a53fe829e0ab99255eaebedabe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 112/460] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From bfd6cba33da3ea324336fa44c7852e716cc1a987 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 113/460] httrack: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/httrack/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 82d25d61c60..3e8eb3a53ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2147,8 +2147,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 3aed4e8e77179d37912e06cf5ad0e6b0c3f2a6aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/460] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From a69b1879b21e0be5f27dc0f53c208118c01b65cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/460] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fbab25812a50dd61b7bca426c865b9aa2daa7ed5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/460] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 143d2fde79bd8ef6eff7a870e70c09176d0eca92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 117/460] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From e148cb30e4c0e6831a0907806696ed2db1fbb37d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 118/460] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From c6ef89b32c8f8def016e87c86c04f803a3c9d9e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/460] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 01815b3554696b13572fd166fe89f88a6f8f447c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/460] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From d29e6bf81d5984a2c321f9e91ce0cf55d824339d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/460] ipmiutil: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/ipmiutil/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e8eb3a53ed..db59c3ecd3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2575,7 +2575,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 5ab16339e961c701f43e0a3b5c99a1dbd0ad1042 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 122/460] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1ab68ada58278e869c3e44725d6d4a93fc3bf93e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 123/460] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 5c2cb721e6e515fc48bd5fca410b982391a524dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/460] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 911677da4863b502f152a9dd8b3dc4496e94c09e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/460] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 77c7708cc4a198147acc9936f98970dcf7855e32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/460] kea: change botan build-option to use OpenSSL

---
 common/shlibs        | 40 ++++++++++++++++++++--------------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db59c3ecd3c..b1ea4fcf930 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2831,26 +2831,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
 libkj-async-0.8.0.so capnproto-0.8.0_1
 libkj-test-0.8.0.so capnproto-0.8.0_1
 libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_1
-libkea-http.so.23 libkea-1.9.4_1
-libkea-log.so.18 libkea-1.9.4_1
-libkea-pgsql.so.18 libkea-1.9.4_1
-libkea-process.so.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From dae02d202207319e58e99261c809f20e38a9066d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 127/460] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 947cb5847d09f3ca050b848b0875f6609673bd98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 128/460] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 36d7614817f4602c630d396eee6ede7a995af210 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/460] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From cdc52fe361a82f061dd7b7e30976d3a8f1b41cc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/460] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 45e22b01c439ade927fccbf01b23baa960f02d6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 131/460] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 5729074880f40fb643339fb7d4f39cbf7b1802f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 132/460] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 4e59eaa9d4aead36a93874935fa9f32d0533bb95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/460] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From df8c01839782236cb044b423e2d3e14f51498af1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/460] ldns: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ldns/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b1ea4fcf930..5a13a319c2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,7 +2000,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From eb8cbbf013dcedfcface0405587c8898641c9d40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 135/460] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 69f0ccd245e7bb30c3b35f84bb4644e5860e0b81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 136/460] libarchive: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libarchive/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5a13a319c2d..dd1248160f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -49,7 +49,7 @@ libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
-libarchive.so.13 libarchive-3.3.3_5
+libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
 libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 0f97a9ff8feea1aeb1a93766dca6b1d4c028f618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/460] libesmtp: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libesmtp/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd1248160f7..69a71b31d50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1323,7 +1323,7 @@ libre2.so.7 re2-2020.06.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
-libesmtp.so.6 libesmtp-1.0.6_4
+libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
 libunwind.so.8 libunwind-1.1_1
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a0498d3b6ec42dcede121442a27bbe976b5cbb4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/460] libetpan: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libetpan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69a71b31d50..2701a5a792e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2139,7 +2139,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 81b0692037474632d5beabebdf4f18fdf7dc821f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/460] libevent: rebuild against OpenSSL

---
 common/shlibs             | 10 +++++-----
 srcpkgs/libevent/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2701a5a792e..c9c6f12a695 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -680,11 +680,11 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.1.so.7 libevent-2.1.11_1
-libevent_core-2.1.so.7 libevent-2.1.11_1
-libevent_extra-2.1.so.7 libevent-2.1.11_1
-libevent_pthreads-2.1.so.7 libevent-2.1.11_1
-libevent_openssl-2.1.so.7 libevent-2.1.11_1
+libevent-2.1.so.7 libevent-2.1.12_2
+libevent_core-2.1.so.7 libevent-2.1.12_2
+libevent_extra-2.1.so.7 libevent-2.1.12_2
+libevent_pthreads-2.1.so.7 libevent-2.1.12_2
+libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 50d73e4cec9fe8961856366a90875a3b75699e28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 140/460] libfetch: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfetch/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c9c6f12a695..0b29dd1a46a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -753,7 +753,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9758823433b355f472583db6a65b62213213cd6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 141/460] libfido2: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfido2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b29dd1a46a..d3bdd768276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3803,7 +3803,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 0a1237e43b125224e96576eeb228ebdb4245ae2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/460] libgda: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/libgda/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3bdd768276..8b07fc46161 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,10 +1395,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 36e0be896425ec26ee021abda627d5faab6dd66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 143/460] libgit2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgit2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b07fc46161..2591b01a24b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1338,7 +1338,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1
 libunwind-setjmp.so.0 libunwind-1.4_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
-libgit2.so.1.0 libgit2-1.0.0_1
+libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From c0ae7b62fed0983cdf609f8b6f33e6e861067e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 144/460] libimobiledevice: rebuild against OpenSSL

---
 common/shlibs                     | 2 +-
 srcpkgs/libimobiledevice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2591b01a24b..a767d7888e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 869c537c8eca86513cff24c79eaf8c5a2d9434ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/460] libircclient: rebuild against OpenSSL

---
 common/shlibs                 | 2 +-
 srcpkgs/libircclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a767d7888e4..d031ce2a12f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 9631ae6d3cd37d9fa69eb9d84a1a7d64a3faff28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/460] libknet1: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/libknet1/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d031ce2a12f..577bfdfddd8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3617,11 +3617,11 @@ libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 4516a1b2eff20acae4bc2c8e4db48950f141548e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/460] libmowgli: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libmowgli/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 577bfdfddd8..6a37071e657 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1110,7 +1110,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 78c228ea8b5cd37bf12ea9a1cc5c7104fc951cd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 148/460] libnice: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libnice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6a37071e657..4eeb96cd81a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -801,7 +801,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 4a7a544612a9daf09c763df503c318e940d66dcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 149/460] libostree: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libostree/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4eeb96cd81a..2346e95843a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2919,7 +2919,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 817a4979a6035e0dd7937a3f4dd18a7c665435f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/460] librdkafka: rebuild against OpenSSL

---
 common/shlibs               | 4 ++--
 srcpkgs/librdkafka/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2346e95843a..55c18ee909f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3788,8 +3788,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From bffc47bdce86e1bf18ea48038b7fab7fab51f291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/460] libssh: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libssh/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 55c18ee909f..342f653031f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1366,7 +1366,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9a8bf85bd9333c0fc8583306f3062aae3db89f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/460] libssh2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libssh2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 342f653031f..6137c67d370 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1061,7 +1061,7 @@ libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
-libssh2.so.1 libssh2-1.4.1_1
+libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
 libsnmp.so.40 libnet-snmp-5.9_1
 libnetsnmp.so.40 libnet-snmp-5.9_1
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4ba67d06f075a60e5842ef85da2130db496d3eff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 153/460] libstrophe: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libstrophe/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6137c67d370..f190fe4cf38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1790,7 +1790,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 35f19f2770f08f13573f07b0bbcb48ac3d76c4f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 154/460] libtd: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f190fe4cf38..f44b9f76ba8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3852,7 +3852,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 8a5f394185a5ad66124e8c637605f620feb5ae36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/460] libtorrent: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libtorrent/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f44b9f76ba8..3dc834a5a51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,7 +819,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 57b4e3065ce5fa9d68e67d898f1ad39248af4a9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/460] libtorrent-rasterbar: rebuild against OpenSSL

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3dc834a5a51..295bf8965d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2004,7 +2004,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From d2a9195b19ce6315952b6a03c5513d8fcac27669 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/460] libu2f-host: rebuild against OpenSSL

---
 common/shlibs                | 2 +-
 srcpkgs/libu2f-host/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 295bf8965d4..a15b0b73706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2419,7 +2419,7 @@ libboinc_graphics2.so.7 boinc-nox-7.6.2_1
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6ccf9448900748e7cfd82811822257fe6580be2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 158/460] libu2f-server: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libu2f-server/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a15b0b73706..b4699ece480 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,7 +2420,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From f0e073c480e60937fde50d91129e87ac023ea974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 159/460] libucl: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/common/shlibs b/common/shlibs
index b4699ece480..2aa8b56ad30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1840,7 +1840,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 6e13340d67b4839a78ffd52a33b61053adb5f752 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/460] libwebsockets: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libwebsockets/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2aa8b56ad30..c3111bb9ed9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2162,7 +2162,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From c03bd75c342c3b28cfc3ca058e404111d6a07834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/460] libzip: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libzip/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3111bb9ed9..70396a572bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1211,7 +1211,7 @@ libtinyxml.so.0 tinyxml-2.6.2_1
 libtinyxml2.so.8 tinyxml2-8.0.0_1
 libbluray.so.2 libbluray-1.0.0_1
 libnfs.so.13 libnfs-4.0.0_1
-libzip.so.5 libzip-1.2_1
+libzip.so.5 libzip-1.7.3_2
 libluajit-5.1.so.2 LuaJIT-2.0.0_1
 libOSMesa.so.8 libOSMesa-9.1_1
 libtaginfo.so.1 libtaginfo-0.1.3_1
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3a3acab4190f19c2c24ff176f3acd3c09ec604f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/460] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 6b7db7ea70d8f753dd7735ce1b49780699284540 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 163/460] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From b99488900a88f6e70264c8c5d3a89a8ccd4a1e0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 164/460] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From fae8851d8fd18689e08a7f52b5f212661a414f64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/460] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a8f92f41e1d67786f731dc5bc9ab346137d22bd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 166/460] live555: rebuild against OpenSSL

---
 common/shlibs            | 8 ++++----
 srcpkgs/live555/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 70396a572bc..a6653680b71 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2963,10 +2963,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 428cb90f984fbc08e3090d11a847cfe7d67a127a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/460] loudmouth: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/loudmouth/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6653680b71..ba1a05c801e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2003,7 +2003,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 0b10f0e967d06f28caa39e24f5170c720dd9dedd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 168/460] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From cbbaea916a279711d359faf1fb2a377899f784be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 169/460] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From efe8eee83a924bf29cfadc54d349e5b404eaf6b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/460] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 9decda129ae7e9ce86b14323c7746d55c3e6aace Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/460] mariadb: rebuild against OpenSSL

---
 common/shlibs            | 6 +++---
 srcpkgs/mariadb/template | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ba1a05c801e..173ef43e85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libecpg.so.6 postgresql-libs-8.4.2_1
 libpgtypes.so.3 postgresql-libs-8.4.2_1
 libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
-libmysqlclient.so.18 libmariadbclient-10.1.47_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
+libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -1583,7 +1583,7 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
+libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 40c1abb9e910e039b678ea5188e95e844868db03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 172/460] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 2cd7cdcf02a242cae1a1a2d1fbc9c46ae4db03c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 173/460] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 48d2faaeffb91b121e25701025c796e1cff4d1f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/460] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From f45ba52ef39981c0e3f15096f11b71d4ee3ace46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/460] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 0ac970a80a4b8b359db5b6b1d40040e9b1c3a42d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/460] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 9f091cccb3744e06d7471a2c3560b12965d4dc77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 177/460] mit-krb5: rebuild against OpenSSL

---
 common/shlibs             | 24 ++++++++++++------------
 srcpkgs/mit-krb5/template |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 173ef43e85b..86648767605 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,18 +560,18 @@ libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
-libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
-libgssrpc.so.4 mit-krb5-libs-1.8_1
-libk5crypto.so.3 mit-krb5-libs-1.8_1
-libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.2_1
-libkadm5srv_mit.so.12 mit-krb5-libs-1.18.2_1
-libkdb5.so.10 mit-krb5-libs-1.18.2_1
-libkrb5.so.3 mit-krb5-libs-1.8_1
-libkrad.so.0 mit-krb5-libs-1.12.1_1
-libkrb5support.so.0 mit-krb5-libs-1.8_1
-libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
-libverto.so.0 mit-krb5-libs-1.8_1
-libverto-k5ev.so.0 mit-krb5-libs-1.8_1
+libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
+libgssrpc.so.4 mit-krb5-libs-1.18.3_2
+libk5crypto.so.3 mit-krb5-libs-1.18.3_2
+libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2
+libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2
+libkdb5.so.10 mit-krb5-libs-1.18.3_2
+libkrb5.so.3 mit-krb5-libs-1.18.3_2
+libkrad.so.0 mit-krb5-libs-1.18.3_2
+libkrb5support.so.0 mit-krb5-libs-1.18.3_2
+libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2
+libverto.so.0 mit-krb5-libs-1.18.3_2
+libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2
 libmenu-cache.so.3 menu-cache-1.0.0_1
 libupower-glib.so.3 libupower-glib3-0.99.3_1
 libcanberra.so.0 libcanberra-0.23_1
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 29a17a82cfef20977f3152ad5826269626d7f7db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 178/460] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 8fd258cccd02c0b4ec4e54ff737cb7783a9efe63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/460] mongo-c-driver: rebuild against OpenSSL

---
 common/shlibs                   | 2 +-
 srcpkgs/mongo-c-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86648767605..a7f794d73e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3858,7 +3858,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 liburing.so.1 liburing-0.7_1
-libbson-1.0.so.0 libbson-1.17.0_1
+libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 093860374d7eb10d936a08529b2475804b227161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 180/460] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 7201239a9d57346704568640c53a0009bc17cac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 181/460] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 78ea53b0b689e7dd660b62c1b4f07500d4c89a5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/460] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 72f748ff87d8b63edf17e42ea2be78f27025d0af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/460] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From fd3aad34448a617fcfa70991728bcb82e297f80f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 184/460] mosquitto: rebuild against OpenSSL

---
 common/shlibs              | 4 ++--
 srcpkgs/mosquitto/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7f794d73e3..a7b941c9fec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2116,8 +2116,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.1 mpv-0.8.0_2
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From a6255527bce98702f6329d538aad29127bfbe500 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 185/460] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 3c624955d9abdb68f230a8444ccf30d2b45fcfad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/460] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 260d8b5cdec7b43f579bc60eb9cf230e6c3dd363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/460] mtxclient: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7b941c9fec..72bacd2baf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From be05c29f11348d23eb2fb5226b63f021d4c0e945 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 188/460] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 4eec7bea8f585e82e14fe808b4bc47af208b7640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 189/460] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 1b6c43644dc7441081c63f1bb29f78a2d027974f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/460] munge: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/munge/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 72bacd2baf3..57da86ac3e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2496,7 +2496,7 @@ libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
 libaudiofile.so.1 audiofile-0.3.6_1
 libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.8 libmgba-0.8.1_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 88c8e33cf9f9119bb097481197ef2b195e0cb2b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/460] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 236b1417c8c54cfe86dcea083589666e09b3c16c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/460] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 0d2286ab5482a3a8a6e3ed977fa44f7807075616 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 193/460] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 19c464fbacb4da12a6f917511e26507015b3f427 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 194/460] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From c5e12cb3db8e5626b60c5e0425cf0b4821933c19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/460] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 09f755be920163474b1bd2996baa829d0f72f948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/460] neon: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/neon/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 57da86ac3e5..49f005001bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -754,7 +754,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5a9b554c655ad735f75c2b27789d1b477e8a6a82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 197/460] net-snmp: rebuild against OpenSSL

---
 common/shlibs             | 12 ++++++------
 srcpkgs/net-snmp/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 49f005001bb..15614f839ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1063,12 +1063,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmpagent.so.40 libnet-snmp-5.9_1
-libnetsnmpmibs.so.40 libnet-snmp-5.9_1
-libnetsnmptrapd.so.40 libnet-snmp-5.9_1
-libnetsnmphelpers.so.40 libnet-snmp-5.9_1
+libsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmpagent.so.40 libnet-snmp-5.9_2
+libnetsnmpmibs.so.40 libnet-snmp-5.9_2
+libnetsnmptrapd.so.40 libnet-snmp-5.9_2
+libnetsnmphelpers.so.40 libnet-snmp-5.9_2
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 58f712cfa5f5018b9432ab8e822fd3b634711e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 198/460] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From bd910210ded710476a51602fa7f07c1cbfb8b0b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/460] netpgp: rebuild against OpenSSL

---
 common/shlibs                                 |   4 +-
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 4 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/common/shlibs b/common/shlibs
index 15614f839ff..26adc4c8a9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -688,8 +688,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
 libmca_common_dstore.so.1 libopenmpi-4.0.1_1
 libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From fff437d40d976ceb5a816a893718bde0fe8093b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/460] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 6ff0fbac114870b65a02e333507784f67732d041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/460] network-ups-tools: rebuild against OpenSSL

---
 common/shlibs                                 |   6 +-
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/common/shlibs b/common/shlibs
index 26adc4c8a9e..e7474756396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1656,9 +1656,9 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
-libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
-libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
 libsphinxad.so.0 sphinxbase-0.8_1
 libsphinxbase.so.1 sphinxbase-0.8_1
 libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 4a39cff6e1369f3e71de4a7b3003b30a61ac190a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 202/460] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 03288076edc304be98197d0d1bdfd192c3c77830 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 203/460] nghttp2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/nghttp2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e7474756396..5ed762a8f57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2190,7 +2190,7 @@ libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
-libnghttp2.so.14 nghttp2-1.0.2_1
+libnghttp2.so.14 nghttp2-1.43.0_2
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 2cd8edc47d68c501e7b192b9534d68dfdfb9cf90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/460] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a7d3952be66c01aa646fde630252c9b18e3a97ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/460] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f1435096f0162a3feab7a434ae7d63e51c3613c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 206/460] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From b791bd016cce049dcf49a82506923fe4c5d1d0cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 207/460] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 2179f55305a4712783194dfde12503cbe791ff50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/460] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 2093d6d8ce3011a5c1e28846af1a5e5b51c9207c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/460] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 41b8fc84e3e59d9d57b05c5ccc620e414b5181ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 210/460] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From eddc936bd15009fb5852489798864a816aa43d05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 211/460] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 0d95159fe834872a8b470be8499f1e535b07a183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/460] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From db5961279884ad26ee774e443f24ffe3aaef9d04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/460] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 0d6d5f6af3b13aa6a16f6da434d245eb4feeb7ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/460] open-isns: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/open-isns/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5ed762a8f57..ebdf2d86924 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2790,7 +2790,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
 libKF5KrossCore.so.5 kross-5.26.0_1
 libKF5KrossUi.so.5 kross-5.36.0_1
 liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From abf45024fc22d41dcba7f4a78c6f604ab5bea3be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 215/460] opendkim: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 3 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/common/shlibs b/common/shlibs
index ebdf2d86924..627e5922023 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2664,7 +2664,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 4d93e349cb931baace2f20be5daea2cd198daf9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 216/460] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From dfeb85ba2b6e44a9a4790ccc6ae1f229dca4eb2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/460] openldap: rebuild against OpenSSL

---
 common/shlibs             | 6 +++---
 srcpkgs/openldap/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 627e5922023..af8d19893fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -677,9 +677,9 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
 libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber-2.4.so.2 libldap-2.4.57_2
+libldap-2.4.so.2 libldap-2.4.57_2
+libldap_r-2.4.so.2 libldap-2.4.57_2
 libevent-2.1.so.7 libevent-2.1.12_2
 libevent_core-2.1.so.7 libevent-2.1.12_2
 libevent_extra-2.1.so.7 libevent-2.1.12_2
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 07d2f396223b68b538de1af685e9524fa8e2b2e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/460] opensc: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index af8d19893fa..05ecfc4ff8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1713,7 +1713,7 @@ libLinearMath.so.2.89 bullet-2.89_1
 libBulletSoftBody.so.2.89 bullet-2.89_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From bb853c2e3486a9c1c463ab9a11d3ca64e080d8c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 219/460] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 6e2c583fa091601d5101269a4132badcbfe1bdaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 220/460] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From d7d0066c074a01dcceed24cd16a9c163e2d4ef06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/460] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From b70d114d73c2313c56efa07de8f8ac73aeaa2544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/460] opkg: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/opkg/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 05ecfc4ff8a..b0d64c819b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3510,7 +3510,7 @@ libvkd3d.so.1 vkd3d-1.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From e818dde2c5613427e9f5406c52621c8b9f3e737a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 223/460] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 1c321b8303ffdff42c3b135711285eb18c876acb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 224/460] opusfile: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/opusfile/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b0d64c819b8..77f5ec4e9d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1201,8 +1201,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 3afcb0368a7cb9858986e08e04d29babc339df5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/460] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From cbd990261666dfa022a41d46339285fe8ab59edb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/460] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 5e21f3e8dc4200f823a10030edb67eab042ea1d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/460] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From a19deeff71bdecfae118b6d44c65b894fd38c707 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 228/460] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 8386202854471d6e683a242273e00d0455018e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 229/460] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e040f626a6d211746516c178ea26facfe245e126 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/460] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a476f162a5f43035e69e92764b7699add1c79476 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/460] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e476f478f76683be691f8fee6248172bfd7b9ac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/460] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 16a0caf07af4725ece29c0b47ac2576d8307d136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 233/460] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From e39a309d3e73f39dd16ce428501a71045ed010df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 234/460] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 9762563da6eb3cf7068bc24021bc385680fe0d06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/460] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 3f9c6d94eebe4ccd382c848654d058bff1556170 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/460] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 498e90fce6f4f3fd22cf6bbfba5ba5ee6a522e60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/460] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From bc48e5c0731785ac110e90601d2fbfff4f62ba98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 238/460] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From b3c743ba2ca6b1f7db4a6e457dbad462fb1985d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 239/460] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From d3628f937be1a04aa9115715a5477b750d286845 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 240/460] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From d4e7be886c265a177fd0cdc864c4760d04c984fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 241/460] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 4861f15432837358331c8d5b98b00fd97673535a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/460] pjproject: rebuild against OpenSSL

---
 common/shlibs              | 28 ++++++++++++++--------------
 srcpkgs/pjproject/template |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 77f5ec4e9d7..050af469a98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2465,20 +2465,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From bff99233e6aa963b86229f3381cf7a792b6cb407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/460] pkcs11-helper: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/pkcs11-helper/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 050af469a98..8b3e2fdb551 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3085,7 +3085,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
 libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
 libr_cons.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 75c1c4c3bcad98138eb2d9ea8caa8f708a6d3d80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/460] poco: rebuild against OpenSSL

---
 common/shlibs         | 26 +++++++++++++-------------
 srcpkgs/poco/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b3e2fdb551..a6a894c3874 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2926,19 +2926,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6eb7a72b360ed887d48d61af33857df31cafe6dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 245/460] podofo: rebuild against OpenSSL

---
 common/shlibs           | 2 ++
 srcpkgs/podofo/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6a894c3874..2cf26d5a163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2518,6 +2518,8 @@ libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-5.0.4_1
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
+libseafile.so.0 seafile-libclient-7.0.10_2
+libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From dded583eeb19cb852c776e74caa1f944f9425083 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 246/460] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From ddb28671b00854c64d4a9e9649301aa5025a4edd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/460] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 5dcb4abf0d0970884a165f0ffab25a891a5d00e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 248/460] postgresql13: rebuild against OpenSSL

---
 common/shlibs                 | 8 ++++----
 srcpkgs/postgresql13/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2cf26d5a163..e3f8216af1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -553,10 +553,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.2 pulseaudio-qt-1.1.0_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-8.4.2_1
-libecpg.so.6 postgresql-libs-8.4.2_1
-libpgtypes.so.3 postgresql-libs-8.4.2_1
-libpq.so.5 postgresql-libs-8.4.2_1
+libecpg_compat.so.3 postgresql-libs-13.2_2
+libecpg.so.6 postgresql-libs-13.2_2
+libpgtypes.so.3 postgresql-libs-13.2_2
+libpq.so.5 postgresql-libs-13.2_2
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 0565116f5ba114baba4a2c155777e0f69a1eb808 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 249/460] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 330765eb90e7da231f3280b681b13a5e772a9314 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/460] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From ce428b82909b0d5883b05156d6f38d23c3f162d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/460] pulseaudio: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/pulseaudio/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e3f8216af1b..6224bac7522 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -728,11 +728,11 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-1.0_1
-libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
-libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-14.2.so libpulseaudio-14.2_1
-libpulsecore-14.2.so libpulseaudio-14.2_1
+libpulse.so.0 libpulseaudio-14.2_2
+libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
+libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulsecommon-14.2.so libpulseaudio-14.2_2
+libpulsecore-14.2.so libpulseaudio-14.2_2
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From de62764544df81aec4bfff7478c8033f614babde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 252/460] python: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/python/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6224bac7522..d371e47a2f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
-libpython2.7.so.1.0 python-2.7_1
+libpython2.7.so.1.0 python-2.7.18_3
 libffi.so.7 libffi-3.3_1
 libffcall.so.0 ffcall-2.1_1
 libavcall.so.1 ffcall-2.1_1
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 0b09fa102dce566ba4c3af421cde52a2841d8cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 253/460] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4ab020e1ad05b0d5dfc2d2edc3284fd1ddccfcca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/460] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 61e2a86f0c4d7d9f8fa37454788dd4e8f59cd55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/460] python3: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/python3/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d371e47a2f8..3b7f4056289 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1734,8 +1734,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.8.0_1
-libpython3.9.so.1.0 python3-3.9.0_1
+libpython3.so python3-3.9.2_2
+libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From d8e8e7f921352feb597537ae1f01a19308ce5f94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/460] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From dd4d70174467cdfbf980d8b996fa75347bab391e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 257/460] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From ec982f7f6a6b4b3aecd0e7001eb7c7bf20938e3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 258/460] qca-qt5: rebuild against OpenSSL

---
 common/shlibs            | 10 ++++++++++
 srcpkgs/qca-qt5/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b7f4056289..d9d6ad7d847 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,6 +2176,16 @@ libclamunrar.so.9 clamav-0.101.0_1
 libclamunrar_iface.so.9 clamav-0.101.0_1
 libfreshclam.so.2 clamav-0.102.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From dbd79b79733ef5e0a8d219676c888b022553ff96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/460] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 8b3f37aa63d4366ec24ae3b690f61f7cb139adb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 260/460] qt5: rebuild against OpenSSL

---
 common/shlibs                                 | 154 +++----
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 3 files changed, 81 insertions(+), 503 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/common/shlibs b/common/shlibs
index d9d6ad7d847..f0a801eb276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1897,87 +1897,87 @@ libgltf-0.1.so.1 libgltf-0.1.0_1
 libabw-0.1.so.1 libabw-0.1.0_1
 libcmis-0.5.so.5 libcmis-0.5.0_1
 libcmis-c-0.5.so.5 libcmis-0.5.0_1
-libQt5Bluetooth.so.5 qt5-connectivity-5.15.0_1
-libQt53DAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DCore.so.5 qt5-3d-5.15.0_1
-libQt53DInput.so.5 qt5-3d-5.15.0_1
-libQt53DLogic.so.5 qt5-3d-5.15.0_1
-libQt53DRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuick.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt53DQuickRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuickScene2D.so.5 qt5-3d-5.15.0_1
-libQt53DExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt5Charts.so.5 qt5-charts-5.15.0_1
-libQt5DataVisualization.so.5 qt5-datavis3d-5.15.0_1
-libQt5Gamepad.so.5 qt5-gamepad-5.15.0_1
-libQt5Nfc.so.5 qt5-connectivity-5.15.0_1
+libQt5Bluetooth.so.5 qt5-connectivity-5.15.2_3
+libQt53DAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DCore.so.5 qt5-3d-5.15.2_3
+libQt53DInput.so.5 qt5-3d-5.15.2_3
+libQt53DLogic.so.5 qt5-3d-5.15.2_3
+libQt53DRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuick.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt53DQuickRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3
+libQt53DExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt5Charts.so.5 qt5-charts-5.15.2_3
+libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3
+libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3
+libQt5Nfc.so.5 qt5-connectivity-5.15.2_3
 libQt5WebView.so.5 qt5-webview-5.15.0_1
-libQt5Qml.so.5 qt5-declarative-5.15.0_1
-libQt5QmlDevTools.so.5 qt5-declarative-5.15.0_1
-libQt5Quick.so.5 qt5-declarative-5.15.0_1
-libQt5QuickTest.so.5 qt5-declarative-5.15.0_1
-libQt5QuickWidgets.so.5 qt5-declarative-5.15.0_1
-libQt5QuickParticles.so.5 qt5-declarative-5.15.0_1
-libQt5QuickShapes.so.5 qt5-declarative-5.15.0_1
-libQt5QmlModels.so.5 qt5-declarative-5.15.0_1
-libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.0_1
-libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Positioning.so.5 qt5-location-5.15.0_1
-libQt5Location.so.5 qt5-location-5.15.0_1
-libQt5PositioningQuick.so.5 qt5-location-5.15.0_1
-libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.0_1
-libQt5Multimedia.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.0_1
-libQt5NetworkAuth.so.5 qt5-networkauth-5.15.0_1
-libQt5Purchasing.so.5 qt5-purchasing-5.15.0_1
-libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.0_1
-libqgsttools_p.so.1 qt5-multimedia-5.15.0_1
-libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Scxml.so.5 qt5-scxml-5.15.0_1
-libQt5Script.so.5 qt5-script-5.15.0_1
-libQt5ScriptTools.so.5 qt5-script-5.15.0_1
-libQt5Sensors.so.5 qt5-sensors-5.15.0_1
-libQt5SerialBus.so.5 qt5-serialbus-5.15.0_1
-libQt5SerialPort.so.5 qt5-serialport-5.15.0_1
-libQt5Svg.so.5 qt5-svg-5.15.0_1
-libQt5CLucene.so.5 qt5-tools-5.15.0_1
-libQt5Help.so.5 qt5-tools-5.15.0_1
-libQt5Designer.so.5 qt5-tools-5.15.0_1
-libQt5DesignerComponents.so.5 qt5-tools-5.15.0_1
-libQt5WaylandClient.so.5 qt5-wayland-5.15.0_1
-libQt5WaylandCompositor.so.5 qt5-wayland-5.15.0_1
-libQt5WebChannel.so.5 qt5-webchannel-5.15.0_1
+libQt5Qml.so.5 qt5-declarative-5.15.2_3
+libQt5QmlDevTools.so.5 qt5-declarative-5.15.2_3
+libQt5Quick.so.5 qt5-declarative-5.15.2_3
+libQt5QuickTest.so.5 qt5-declarative-5.15.2_3
+libQt5QuickWidgets.so.5 qt5-declarative-5.15.2_3
+libQt5QuickParticles.so.5 qt5-declarative-5.15.2_3
+libQt5QuickShapes.so.5 qt5-declarative-5.15.2_3
+libQt5QmlModels.so.5 qt5-declarative-5.15.2_3
+libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.2_3
+libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Positioning.so.5 qt5-location-5.15.2_3
+libQt5Location.so.5 qt5-location-5.15.2_3
+libQt5PositioningQuick.so.5 qt5-location-5.15.2_3
+libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.2_3
+libQt5Multimedia.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.2_3
+libQt5NetworkAuth.so.5 qt5-networkauth-5.15.2_3
+libQt5Purchasing.so.5 qt5-purchasing-5.15.2_3
+libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.2_3
+libqgsttools_p.so.1 qt5-multimedia-5.15.2_3
+libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Scxml.so.5 qt5-scxml-5.15.2_3
+libQt5Script.so.5 qt5-script-5.15.2_3
+libQt5ScriptTools.so.5 qt5-script-5.15.2_3
+libQt5Sensors.so.5 qt5-sensors-5.15.2_3
+libQt5SerialBus.so.5 qt5-serialbus-5.15.2_3
+libQt5SerialPort.so.5 qt5-serialport-5.15.2_3
+libQt5Svg.so.5 qt5-svg-5.15.2_3
+libQt5CLucene.so.5 qt5-tools-5.15.2_3
+libQt5Help.so.5 qt5-tools-5.15.2_3
+libQt5Designer.so.5 qt5-tools-5.15.2_3
+libQt5DesignerComponents.so.5 qt5-tools-5.15.2_3
+libQt5WaylandClient.so.5 qt5-wayland-5.15.2_3
+libQt5WaylandCompositor.so.5 qt5-wayland-5.15.2_3
+libQt5WebChannel.so.5 qt5-webchannel-5.15.2_3
 libQt5WebEngineCore.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngine.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngineWidgets.so.5 qt5-webengine-5.15.0_1
-libQt5WebSockets.so.5 qt5-websockets-5.15.0_1
-libQt5X11Extras.so.5 qt5-x11extras-5.15.0_1
-libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.0_1
-libQt5Core.so.5 qt5-core-5.15.0_1
-libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5Network.so.5 qt5-network-5.15.0_1
-libQt5Sql.so.5 qt5-sql-5.15.0_1
-libQt5Xml.so.5 qt5-xml-5.15.0_1
-libQt5Gui.so.5 qt5-gui-5.15.0_1
-libQt5Widgets.so.5 qt5-widgets-5.15.0_1
-libQt5Test.so.5 qt5-test-5.15.0_1
-libQt5DBus.so.5 qt5-dbus-5.15.0_1
-libQt5Concurrent.so.5 qt5-concurrent-5.15.0_1
-libQt5OpenGL.so.5 qt5-opengl-5.15.0_1
-libQt5PrintSupport.so.5 qt5-printsupport-5.15.0_1
-libQt5XcbQpa.so.5 qt5-gui-5.15.0_1
-libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.0_1
-libQt5TextToSpeech.so.5 qt5-speech-5.15.0_1
-libQt5Bodymovin.so.5 qt5-lottie-5.15.0_1
+libQt5WebSockets.so.5 qt5-websockets-5.15.2_3
+libQt5X11Extras.so.5 qt5-x11extras-5.15.2_3
+libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.2_3
+libQt5Core.so.5 qt5-core-5.15.2_3
+libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5Network.so.5 qt5-network-5.15.2_3
+libQt5Sql.so.5 qt5-sql-5.15.2_3
+libQt5Xml.so.5 qt5-xml-5.15.2_3
+libQt5Gui.so.5 qt5-gui-5.15.2_3
+libQt5Widgets.so.5 qt5-widgets-5.15.2_3
+libQt5Test.so.5 qt5-test-5.15.2_3
+libQt5DBus.so.5 qt5-dbus-5.15.2_3
+libQt5Concurrent.so.5 qt5-concurrent-5.15.2_3
+libQt5OpenGL.so.5 qt5-opengl-5.15.2_3
+libQt5PrintSupport.so.5 qt5-printsupport-5.15.2_3
+libQt5XcbQpa.so.5 qt5-gui-5.15.2_3
+libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.2_3
+libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
+libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.192 x265-3.4_1
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 105e4154586187b6c3b4f778d3859821cce4ed31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 261/460] rabbitmq-c: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/rabbitmq-c/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f0a801eb276..241b56bc342 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From dae66b364e068064100bd67af0f0d90652fe930b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/460] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 05c101aace1ff4d2abb240f116ed6b42d68aba3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 263/460] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 48b22bf12bb225b2b1c5ae21fd3136581efd5b65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 264/460] re: rebuild against OpenSSL

---
 common/shlibs       | 2 +-
 srcpkgs/re/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 241b56bc342..ea0d6b61b1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3387,7 +3387,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-0.5.8_1
+libre.so re-1.1.0_2
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From 142fcfef502e433f6730347d3db917450346ee21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/460] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 1a3f4ea2ae3e08b6b506b2f84fd86eab0efc8893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/460] rhash: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/rhash/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ea0d6b61b1e..aedbdb898bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2932,7 +2932,7 @@ libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
-librhash.so.0 rhash-1.3.4_1
+librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From cd90330c32b9843fd9017b7c722e562471528083 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 267/460] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From c4342d3daa576c1150e0291cb19ad1fdfcd49288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 268/460] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 8ef47a25de594d00962a31894d6ea778ff8ca98b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/460] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 8e8f227410b77093b662d61c3b74755668c42368 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 270/460] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From e9fdd1042e4b50b2cc08dac1edaeafa82768ccbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 271/460] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 73c0167515b9fdc65dd3e31dc0edf857095c8b23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/460] rtmpdump: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/rtmpdump/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aedbdb898bf..69fc52c05a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1081,7 +1081,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From c2ba59a425424f627b42ecf63cb0d3fa5a477d7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/460] ruby: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ruby/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69fc52c05a8..bf59e9a46a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -435,7 +435,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.1_1
+libruby.so.2.7 ruby-2.7.2_3
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 563723b3bb5d1d4978b21cf1a52c5b7215e78c24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/460] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 7a09351aa5defa22044bfc76345333dd50b4ef48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 275/460] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 29a7f83c7d2a68e55b362a5a63d674f1d762b450 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 276/460] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 76c945c71a2a781a20823aafa330994da8ca8f7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/460] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c17ca2ba31d344c3894d189df8a72604f0081ecf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/460] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 765d9000009e94a763c9c4babb6bec7504180e4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/460] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From d0e030c2d13c17ac2bf9ed5ddea42e55fbaaffee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 280/460] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 0f6228e029726fe2ae10661bdb8350ee23f61edf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 281/460] seafile-libclient: rebuild against OpenSSL

---
 common/shlibs                      | 2 +-
 srcpkgs/seafile-libclient/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bf59e9a46a6..5bfa9fe8223 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2526,7 +2526,7 @@ libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_2
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 7151816e7f9b4abdb6a4d561e2f6c9cf460f7497 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/460] serf: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/serf/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bfa9fe8223..2862f68f10d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1414,7 +1414,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From ed6c9b3e7dc4be20a16e166879c397408faa70bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/460] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From faeb5af54245445a6cabf8b8fc4752c9fd0dcb52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 284/460] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From dfbdd37907742f8a4ad29a2055a3acf9683fe7a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 285/460] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 39c6ce3a8ce75c816b8aaf8887759661252a7f1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/460] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 670592abc67632b6bd5d8dcee7deb66b9bbcc995 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/460] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 44096ca10b1efd731457f1f0d867bb24cf595cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 288/460] spice: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/spice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2862f68f10d..c02a6ba7aa2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -783,7 +783,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From debc98ea73497b0fc11ef5a2d40e6ef99cb7c5f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 289/460] spice-gtk: rebuild against OpenSSL

---
 common/shlibs              | 6 +++---
 srcpkgs/spice-gtk/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c02a6ba7aa2..d60be99503b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1167,9 +1167,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 8284977f1c1215ce1986395d0a4c0e36cb9ecb4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/460] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 61195f109d1ef98d1f773359e80c70e23c54df42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/460] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From f33639361d289c2741d00f8e44c0eec2ffb0b811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/460] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From ecc027529bf78fac0d08c0080b3722b5121023bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 293/460] sqlcipher: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/sqlcipher/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60be99503b..6003344112d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2431,7 +2431,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 8891c8b4091d4418ee24b7ad53c28f6d39d9a594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 294/460] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From f28ad6cf35e76e6370da00ae780769b24296902e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/460] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From dd8ea3e15187e1f950d1b0ee74793b19d0c74864 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 296/460] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From ac6678a58aa8e14bad8137a7ef77f12b13c0f0ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 297/460] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 5114b4a30ca0c30761c1b18373ad2a0be599b931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/460] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1ed88bd30db495904dfe5475a74310e791b6cf3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 299/460] swi-prolog: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/swi-prolog/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6003344112d..c0f3b80bd27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2820,7 +2820,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 25e9812bbd76ca60912d8b811259b10f57a843f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 300/460] swiften: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/swiften/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c0f3b80bd27..774457976aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2546,7 +2546,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 6492b0d5350c7340a8b3b56b45ecad26514c6575 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/460] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From ef1bd7aafe54f942e82c1d9b08ee3a015abc3f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/460] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From a162853e706f8d47f88c062bfc954f7977e5970b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/460] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From c049dd3f694ec133c9160578bc5e80b3046fa5ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 304/460] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 070aba6841a08deb579c66abc2f18dadf09fe01d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 305/460] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 90a03dda849ff814dacb710295882985693499bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/460] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 6eea854892d612c3b1b96a68ada267d66dc34d1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/460] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a7fe0eba47e6cbdf1103ef802be279f7e0054577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 308/460] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 26c95874fe13b5115a7d538a89e45b4279ad7589 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 309/460] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 00c01f8f7dd0caf145b50a21feec4f085fdd1c82 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/460] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From d5b421c4d59add5f42af39ff5d4adc86828aed2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/460] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 0faeedebf37012e83df9549ab42fc1fca1b11fb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/460] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe263d44a381b7b1eb4be1637f34921be3cfaf3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 313/460] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 463546b3a075559d7dcb0838fb61a24c14bedfc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 314/460] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 46dffe773733a5af541958082447612d17ac63f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/460] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 26d8495f0cd66e3f1f7979217255194b7797f88c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/460] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From dd35b797e07e8a37bf190c196c26aae1775d023d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 317/460] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From ed550c648b40333d7a8c7cf9460fd8c3c2a9223e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 318/460] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 219905643267ed1ece870e83b8855b021f14b33b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/460] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From d6cf41c1a39f0746ae0ce313616e9cd24e4b3721 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/460] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 36590a1fbccf99f11c7707eb5625494b38cb96d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 321/460] trousers: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/trousers/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 774457976aa..316410afd23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2499,7 +2499,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 00a6ecc26ecfa79ede55fe74a61963163c43827f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 322/460] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 0a9d3be32fab5b45dae862e6ff3ef0108f03e2f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/460] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 76c9b953143e1dab830b120736e06b24d2bc88d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/460] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From bc9ff72be5e59511bf48100f01f09d05ebd26dad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/460] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 787e76f4aa1e4abcdb415af9de7114e662bce9cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 326/460] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From a61fdf39ca26b023fac2a438cfc2fc1be578c562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 327/460] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From c0eb0bdc88a2e6a3626eafa7c3da42b53196fd77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/460] unbound: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/unbound/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 316410afd23..ff81c10815f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
 libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 79d1f00d69c42dab1fb3b4ab3306e03ef97644cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/460] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From f25adb537f93efa282a64eb0e1b30e3bcd678531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 330/460] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 463aa27480a5b045eecf9dedeb0ab66c56dfe987 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 331/460] vde2: rebuild against OpenSSL

---
 common/shlibs         | 8 ++++----
 srcpkgs/vde2/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ff81c10815f..b8215da073e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1089,10 +1089,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
 libxbps.so.5 libxbps-0.59_1
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From b47e19e6cff7b2c19f36aed8e602adc07bc41dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/460] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From ff4cfa4dc09cdd5b9e4151476f3d18b1afc20df8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 333/460] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 93f337b37a6ea36aa1b6cd66a6af5e28035963e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 334/460] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From e71b7c38384afd6f17ec07b382d3d2b1aaa18015 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/460] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From c5f7c067bfb4580fd2cb738a77b703b388ad2b73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/460] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From fc30d54aefd1d88fed0028dadf8779469e1ff67c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/460] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 30a901f0a3d21bddf9c482ee85a0e9508a914ea8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 338/460] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 9603c466adf959e1ae19cdbbc29c119c41ad382e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 339/460] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 2900b53060ec0ceb568b200f179282484536049f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/460] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From d9604f6d03350e01675e5a1117eaa36f8d561817 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/460] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From d57f5fb20e7935d842b75e11b885e23f1262cdce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 342/460] wvstreams: rebuild against OpenSSL

---
 common/shlibs              | 8 ++++----
 srcpkgs/wvstreams/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b8215da073e..ffb1ecbfa66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2076,10 +2076,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From eb6efc710828fbe75077596dfc74e4cdff1e8661 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 343/460] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 9dc89780e24f5c61b874229e7860e631fa4e4ec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/460] xar: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/xar/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffb1ecbfa66..326c7d1b95e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1096,7 +1096,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From bf77af9c058a36562683c64407b538071198f9ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/460] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From ebbd4babbdbb0ce73d82a48cbeffd58fc4dd3fc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/460] xbps: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/xbps/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 326c7d1b95e..8ea49a59d9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1086,7 +1086,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
 libminiupnpc.so.17 miniupnpc-2.1_1
-libxbps.so.5 libxbps-0.59_1
+libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
 libvdeplug.so.3 libvde2-2.3.2_23
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 4d01d019bd8cdb4bbcaeaae1ae2977421e68b7ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 347/460] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From e3a07c68ebf6c3f107bbdf02cf1b5f4f8431804f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 348/460] xmlsec1: rebuild against OpenSSL

---
 common/shlibs            | 10 +++++-----
 srcpkgs/xmlsec1/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ea49a59d9a..d8a50fbafa3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1535,9 +1535,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1726,8 +1726,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 92e8ca27156dbc003c3d54c7b99c58b15a4e1dbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/460] yara: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8a50fbafa3..441eb89c0fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2970,7 +2970,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 96c8537fca2a9c065c3e0b97e707dbc5fa97dd2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/460] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 2726338d6d29efa0188450094bebe0577c120beb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 351/460] yubico-piv-tool: rebuild against OpenSSL

---
 common/shlibs                    | 4 ++--
 srcpkgs/yubico-piv-tool/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 441eb89c0fb..ab61f1e265a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,8 +3120,8 @@ libr_crypto.so.5.0.0 radare2-5.0.0_1
 libr_fs.so.5.0.0 radare2-5.0.0_1
 libr_magic.so.5.0.0 radare2-5.0.0_1
 libr_reg.so.5.0.0 radare2-5.0.0_1
-libykpiv.so.1 libykpiv-1.5.0_1
-libykcs11.so.1 libykcs11-1.5.0_1
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From bdb2ccc8b147c4fa3835cb10b8806fcb90c309d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 352/460] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f3e6e6ed4c8f61724ca88a00c93d176bde4ebacf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/460] zchunk: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/zchunk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ab61f1e265a..9cce0be6e16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From cbff704adf4eaf378b8f6a8bea084c9484cce9b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/460] zeek: rebuild against OpenSSL

---
 common/shlibs         | 10 +++++-----
 srcpkgs/zeek/template |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9cce0be6e16..aa6e54e9180 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3506,11 +3506,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From a10d6f0212eeb3be72dc716e29c70e18fbbd2eaf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 355/460] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 54c0b5d503e105164e98bab75d755649b5ecc49d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 356/460] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 48c969208aee0d46aad5981982d1b915fb8fd798 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 357/460] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From c1b53f5447424d5033151fae66b3005fe7040b66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 358/460] c-client: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/common/shlibs b/common/shlibs
index aa6e54e9180..a6ea82d1f12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2365,7 +2365,7 @@ libdwarf.so.1 libdwarf-20160613_1
 libmemcached.so.11 libmemcached-1.0.18_1
 libhashkit.so.2 libmemcached-1.0.18_1
 libmemcachedutil.so.2 libmemcached-1.0.18_1
-libc-client.so.1 c-client-2007f_1
+libc-client.so.1 c-client-2007f_4
 libonig.so.5 oniguruma-6.8.1_1
 liblo10k1.so.0 alsa-tools-1.0.29_1
 libgflags.so.2.2 gflags-2.1.2_1
diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..bf65dc7277b 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 0f18ecdee14a4f57ce87ac461b7b5778788e2290 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 359/460] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 7f4f3856ed5e5b4598a766162bd35785db1d97c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 360/460] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From c12575b6091f5d06ccb23d925de695f75dd1d4ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 361/460] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..e2fb62b08d8 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 6041d8fc2f2a8a1dc396ee92e82734692c690b76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 362/460] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 386f048b5df83dcbf68190e66b965cf4b02f9163 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 363/460] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 363be277f9f6d3b7a7f67d4366cc8b91feeed679 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 364/460] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From e9f1a993fa1a2ca2a509d84ca7032c42c3a34a0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 365/460] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From a16b1776b9c820d9c9d9639b1e5d8ea7752cae9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 366/460] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From c2e4a6e159941d12403de160cd038caf70b6edde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 367/460] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 7ab3c488313e47223a06529e7bae8ae50f029663 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 368/460] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 69b8bacfa4ecc86f77af2bf5f91d417e5843ff78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 369/460] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 46ad03cb1abad4297ce0b2e8475ec3a98203d8fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 370/460] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From bb490647d151b9e029219b6b860c019a5ef05578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 371/460] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From 3212c93e177d6693f5e0618abeb85687338928c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 372/460] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 8d28deab1484b4084038954b9154d642ffb690a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 373/460] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 79d4cb5eb15474ec52e4959dc68207c9d7a089a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 374/460] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 767cbe068a87d46f9c7654028618570d569e257d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 375/460] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From cfd835e1ff1ef43628727bbd8ca939226d2e55fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 376/460] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From fec7c263106d167f4cc9a94c6842aef7931fe455 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 377/460] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From e0bb391b16da89bba5710be6da1d589849cfc8a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 378/460] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From eff73091929debf01065a86eeee4032b4a8a5b04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 379/460] libvncserver: rebuild against OpenSSL

---
 common/shlibs                 | 4 ++--
 srcpkgs/libvncserver/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6ea82d1f12..0476aee0fa5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1381,8 +1381,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 35257d1c4e88de9028e6134ffdb6433ac3f001d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 380/460] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 3d2e80f6245899560e74ea48cd0a247bc594f1b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 381/460] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 2a242196e75f99c1bc8e9b7d41531d8d7c7eac27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 382/460] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From a937b1f740b94cc98b76a1a1d58b2a8979ed4083 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 383/460] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index 0476aee0fa5..d8abe9689f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -579,7 +579,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 8f16f812b33b1f52baea8486f5dedeb978d0f735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 384/460] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 02afa2c0404973b7647d279e27445babb1b15292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 385/460] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 37010596573f97ccf3494e5e581f58a75e1632ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 386/460] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From f0fdfb5f4a82b898c40c812e8f5b7ccf6d022b4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 387/460] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From c8979a1903d057e4df03ecf398f47cf21c205233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 388/460] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From ba5fbd8487ce855e0339c601d4016b297856f7ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 389/460] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From ec662b91aed1a1afd9576c6a6f519b76e528cf72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 390/460] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 177d0a7466482f5d4da4fe8eff92902ea84205d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 391/460] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From ca69aee8295c3574e3b27a5b5809996622a955f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 392/460] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From a137d5e3897d6fbb11cc93b7245caac76e695d4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 393/460] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From fd042537402b5004fa9cef8ace5e9de77df43dc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 394/460] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From d234b7409fa237fc962c06f5f6ee5f9f141c9fcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 395/460] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From 8d74f71b201136d840e25f331b93a6c8f8188286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 396/460] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 05f40e86afea25927006f83d4445456f61d46a9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 397/460] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 0d62e234ccea60b0db95f0cee746fb17d888a3dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 398/460] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 5553a11f581584be65899fc9317ca7ff1a95c018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 399/460] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c2db0cc6fa54fba34b3a8ad032d755d394fc7f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 400/460] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 281405c711406747fdde388d3a381cc351ba2ef4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 401/460] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 422dc6ead44eb33fa634546186aaf6f3fdacb307 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 402/460] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 0d12462f817cec1b488362817ad867e3a368c039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 403/460] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From de8d27401e145a5442b1bf51026b92be5148d00d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 404/460] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 2f163f52b3504387afc56809e826030b4747e5ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 405/460] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 95291071e9ac49d844eaffd7cdecce22e0710c63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 406/460] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 8cd41b2be03eebf103feeea8227bd7accc05bb01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 407/460] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 46315f3b5127644f7acbc33b67e9419a496269ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 408/460] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 7644accad6b7436dce2719796de321f1e8b96788 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 409/460] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From c219e2de67b5888771f084db1f547f06cfa81e8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 410/460] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b762262e2611fd7922c92f977dc4c37c678c5987 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 411/460] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 2f87f7293f5be9f31a62bbf2dbc9d11173d81b6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 412/460] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 02dbba0ce5caeb2d189864f26c1c1f3659f202c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 413/460] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From ce494cc8f57e8267b9721c1cb093f22a539c3767 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 414/460] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6fefb4c6e8ec5a5fe73fa23b78ab66256de726da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 415/460] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 3d2e62aa7374290b432364c2200ca34edbc879fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 416/460] xen: change to OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From cf041ea3d5f5e69245b6c52ae54b0953b673796f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 417/460] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From ecaa6d06fbfa67934908a53a0a4cb97034eabcbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 418/460] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 8f21d0cdfdfed1e452e36d96f28d5b8dfd7ecc99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 419/460] boinc: rebuild against OpenSSL

---
 common/shlibs          | 12 ++++++------
 srcpkgs/boinc/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8abe9689f6..c70bb21a258 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,12 +2420,12 @@ libcsound64.so.6.0 csound-6.05.0_1
 libcsnd6.so.6.0 csound-6.05.0_1
 libfko.so.3 libfko-2.6.9_1
 libvterm.so.0 libvterm-0.0.20151005_1
-libboinc_opencl.so.7 boinc-7.6.2_1
-libboinc_api.so.7 boinc-7.6.2_1
-libboinc_graphics2.so.7 boinc-7.6.2_1
-libboinc_opencl.so.7 boinc-nox-7.6.2_1
-libboinc_api.so.7 boinc-nox-7.6.2_1
-libboinc_graphics2.so.7 boinc-nox-7.6.2_1
+libboinc_opencl.so.7 boinc-7.16.16_2
+libboinc_api.so.7 boinc-7.16.16_2
+libboinc_graphics2.so.7 boinc-7.16.16_2
+libboinc_opencl.so.7 boinc-nox-7.16.16_2
+libboinc_api.so.7 boinc-nox-7.16.16_2
+libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 35ac5545f194b75e28be0b60d9268070e83b5062 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 420/460] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 21f6748365ed1609f7fa0e841208149f79e7dcdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 421/460] clamav: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/clamav/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c70bb21a258..e077692a149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2171,10 +2171,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.101.0_1
-libclamunrar.so.9 clamav-0.101.0_1
-libclamunrar_iface.so.9 clamav-0.101.0_1
-libfreshclam.so.2 clamav-0.102.0_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From a2ed315fc37d30996487e38160456155d2cc79c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 422/460] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From 32f971dd902dec6679591c3fe9ff065a677f8bb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 423/460] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 48f901e848da8618a9a38ef4ec925c19f3f17a69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 424/460] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From a5af21b57fb7bbe0bb9aa44835fccd9196b38b4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 425/460] libgdal: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgdal/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e077692a149..234646579ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2433,7 +2433,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 430667b36711837e442d0d9d7a8440986df84a2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 426/460] lxc: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/lxc/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 234646579ef..6f07ec34677 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1539,7 +1539,7 @@ libxmlsec1.so.1 xmlsec1-1.2.31_2
 libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
 libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 011deaabe5344cd62164e1d165c51f5089d7f677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 427/460] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From f4433d636337b2ce2ffeab574057729db1fdabcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/460] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 2e5b4d3a2ebe311b42a0902b07283c62be10035c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/460] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 3de8ae3092f5f5a40ade04ed9eb5e0de74d2c4e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 430/460] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 9b89a3cab8b7d82646e125cd8cfbdefae4d88dc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 431/460] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From f8aac51fadc220cda353258895d7029509c5e41c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 432/460] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 27cfa1b9d7561f22eda1352bf67cd94fe92edf30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 433/460] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 7c339d671e5b477c26566ca3fa6010ac40556cac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/460] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 9baee395fca3d368d2bc61464124b338059f6eef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 435/460] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 1c15be6489b38793edf7d7d75141821127c146c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 436/460] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 200fec7b566d7c149d1aec9a70cb9d3c9796c701 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/460] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 7201ad62c84869225fc79c6900e34787525743c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/460] sssd: rebuild against OpenSSL

---
 common/shlibs         | 18 +++++++++---------
 srcpkgs/sssd/template |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6f07ec34677..c2e8e4eaec1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2686,15 +2686,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From b23b3493b2aeb22e859b3ea73b0ebbe2845a2417 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 439/460] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From aed33b44d1c4a92375b23594a056ea2585238cef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 440/460] xmlrpc-c: rebuild against OpenSSL

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/xmlrpc-c/template |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2e8e4eaec1..dfbbd9cba30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1738,22 +1738,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 1bef82b8ec720c6bf421906fb1f6b8fd7045ee76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 441/460] zfs: rebuild against OpenSSL

---
 common/shlibs        | 12 ++++++------
 srcpkgs/zfs/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dfbbd9cba30..f1f80201e6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3789,12 +3789,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From 716b13b75ee19c6e0d4a64da86afa17f869cf0c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 442/460] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 55c44f21c02da71d8087a8df655a3f871414c5b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 443/460] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 4ef31fb2976e29d4cb7691800dcaff3bb71da716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 444/460] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 904f36879ce694be8bb51aa4724d1b273b7e0415 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 445/460] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 30b1b4baf8a8cbf16ffd54363a6d0d932a3ba4c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 446/460] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 587c4b0f23b97febf6c5d7cd2dd083eb0fb8cc9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 447/460] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 468a1e1fce9f8b7b1d72cdd6186a133cb3fd0d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 448/460] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 5f37854b7e70db5c6a988c3182aa10c6d90e55d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 449/460] acme-client: remove package

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a8a42aa0a3..ed7e812aab8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 85dcbf4f75653aaf2eef6f0174b279e95aa9befa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 450/460] Ice: rebuild against OpenSSL

---
 common/shlibs        | 32 ++++++++++++++++----------------
 srcpkgs/Ice/template |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f1f80201e6d..b24e4c54a6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,22 +961,22 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.8 kdecoration-5.21.0_1
-libGlacier2.so.37 libIce-3.7.5_1
-libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
-libIce.so.37 libIce-3.7.5_1
-libIceSSL.so.37 libIce-3.7.5_1
-libIceUtil.so.37 libIce-3.7.5_1
-libIceStormService.so.37 libIce-3.7.5_1
-libIceStorm.so.37 libIce-3.7.5_1
-libFreeze.so.37 libIce-3.7.5_1
-libSlice.so.37 libIce-3.7.5_1
-libIceBox.so.37 libIce-3.7.5_1
-libIceGrid.so.37 libIce-3.7.5_1
-libIcePatch2.so.37 libIce-3.7.5_1
-libIceDB.so.37 libIce-3.7.5_1
-libIceXML.so.37 libIce-3.7.5_1
-libIceDiscovery.so.37 libIce-3.7.5_1
-libIceLocatorDiscovery.so.37 libIce-3.7.5_1
+libGlacier2.so.37 libIce-3.7.5_2
+libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2
+libIce.so.37 libIce-3.7.5_2
+libIceSSL.so.37 libIce-3.7.5_2
+libIceUtil.so.37 libIce-3.7.5_2
+libIceStormService.so.37 libIce-3.7.5_2
+libIceStorm.so.37 libIce-3.7.5_2
+libFreeze.so.37 libIce-3.7.5_2
+libSlice.so.37 libIce-3.7.5_2
+libIceBox.so.37 libIce-3.7.5_2
+libIceGrid.so.37 libIce-3.7.5_2
+libIcePatch2.so.37 libIce-3.7.5_2
+libIceDB.so.37 libIce-3.7.5_2
+libIceXML.so.37 libIce-3.7.5_2
+libIceDiscovery.so.37 libIce-3.7.5_2
+libIceLocatorDiscovery.so.37 libIce-3.7.5_2
 libkdecorations2private.so.8 kdecoration-5.20.90_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From 0d68205b4dbc5e8ce48a0045a01f16d8bcb10c5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 451/460] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 1d9e3119a781d8a64dc051bd317a643d73a63328 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 452/460] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From babdae9687a8530d7debe964945fd169a85f64a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 453/460] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5a33547996702a45818ad128f2185a1925c0c620 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 454/460] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 7e6deb40c321bde615f731de44f734e3fb84cb4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 455/460] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From afc10ce2d88ca2c793a254ac2a5ef303afbb4d70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 456/460] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From b84d9f7aca6bee876c136f0526de01705da442cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 457/460] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc..fbf723826ac 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.178
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From d91ed4eee0ad28fbe237ea207aca705414bf6e8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/460] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From e71b91cdbda3ad8b8642393233ab5e2bd204775d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 459/460] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d..8944092048b 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.102
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From a2c517b5cecf047c814c7456b2fefecc11997896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 460/460] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e4..0ff0fdd4706 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=2
+revision=3
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 682138 bytes --]

From c03fb64361390fd12d7b25c69012cc1284508771 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/462] libressl-netcat: remove, will be moved to libtls.

---
 common/shlibs             |  2 +-
 srcpkgs/libressl-netcat   |  1 -
 srcpkgs/libressl/template | 13 +------------
 3 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/libressl-netcat

diff --git a/common/shlibs b/common/shlibs
index c836cc1a377..dff7be03a35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,7 +3446,7 @@ libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-netcat
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}

From a91ed9d9db708146215369bcc1d46e5656f078ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 002/462] New package: libtls-3.2.4

---
 srcpkgs/libressl-netcat |  1 +
 srcpkgs/libtls-devel    |  1 +
 srcpkgs/libtls/template | 94 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libtls/update   |  1 +
 4 files changed, 97 insertions(+)
 create mode 120000 srcpkgs/libressl-netcat
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libressl-netcat
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..9577944a860
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,94 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+homepage="http://www.libressl.org/"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.2.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" e1c76178c4deb1cd20a0cd7ba553d6607f8131acb2e0844223f797e42f0d6f60"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 39819bbd1b1d353c4f39219dbe44e98097939bd1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 003/462] catgirl: rebuild for libtls-3.2.4.

---
 srcpkgs/catgirl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc54..6ddf5e3bb62 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 273137a9ea2b212696ade7b1ccc6e44ac6b79cf5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 004/462] litterbox: rebuild for libtls-3.2.4.

---
 srcpkgs/litterbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From 020384d0817df7dfe4d0f60bff9ae515e990090d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 005/462] pounce: rebuild for libtls-3.2.4.

---
 srcpkgs/pounce/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a17..4e33113d349 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 39b7ceea901c7bf6187fb29a290d81ff88b9c8a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 006/462] openntpd: rebuild for libtls-3.2.4.

---
 srcpkgs/openntpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b231bb644a2c45bf20fcecf7fd49302b6b6cfc14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Feb 2021 16:10:02 +0100
Subject: [PATCH 007/462] acme-client: remove, unmaintained upstream.

---
 srcpkgs/acme-client/INSTALL.msg |  1 -
 srcpkgs/acme-client/template    | 25 -------------------------
 srcpkgs/acme-client/update      |  1 -
 3 files changed, 27 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a283..00000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa476..00000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd7..00000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'

From 50852b3e23dc2c56d7fa93fb8d2fd02d6fc23b00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 008/462] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 29df461c38a966b65be13ec251d2f63ae64e7c71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 009/462] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..fdd5986a740 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 655887e9361a1cd4640a581ad527dd66b67b6da4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 010/462] ifuse: drop unused LibreSSL makedepends

---
 srcpkgs/ifuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..95c48dbe8cd 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8556ada25110060b7f607231e363efef442392a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 011/462] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..f62a206c1fd 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From 28cb10212eb2a7d22de2a70fe55b1eb1651c625d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 012/462] android-tools: drop unsued LibreSSL dep

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d77407..b394a98c10b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"

From aa1ce2a3e4345ac42f9048d18634cd909434b161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 013/462] s6-networking: change libressl buildoption to libtls

---
 srcpkgs/s6-networking/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a3..963cbaa3e9d 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 51979e130e3bf875a1045e446799721148391f7c Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 014/462] New package: openssl-1.1.1j

---
 common/shlibs                          |  5 ++
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index dff7be03a35..305041c8e5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,11 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..eb9ca1efba1
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From eb01a385c504e4ad81145a394cb3204718e3ae1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 015/462] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 7 files changed, 136 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48

diff --git a/common/shlibs b/common/shlibs
index 305041c8e5a..5bdb4175c62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,8 +1760,6 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.43 libcrypto43-2.7.2_1
-libssl.so.45 libssl45-2.7.2_1
 libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a2..00000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b8..00000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a832..00000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb51..00000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From bb0e81f75e529ccf5b43eb222f6e89844110bc4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 016/462] ca-certificates: rebuild for openssl

---
 srcpkgs/ca-certificates/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..854e76a613c 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
 		${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
-	vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
 }

From 55b59610d3747cdcea3478583deed9fbccf3a97c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 017/462] FreeRADIUS: rebuild against OpenSSL

---
 srcpkgs/FreeRADIUS/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 813841d763d2090252b5b04ebf8632f33dfc3628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 018/462] LGOGDownloader: rebuild against OpenSSL

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From 6447ac3c200558a10842aadbb474937e86f7b07f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 019/462] MEGAsdk: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/MEGAsdk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bdb4175c62..1375f975e42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3058,7 +3058,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30703 MEGAsdk-3.7.3c_1
+libmega.so.30703 MEGAsdk-3.7.3c_2
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From 75e3e19f5b764687d27c8beefafcbba683b38e5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 020/462] NetworkManager-l2tp: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-l2tp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From 6e3d31515548fc03090e99416a73e69b69fffe1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 021/462] OpenRCT2: rebuild against OpenSSL

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..b8ea8849863 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.18
 _titles_version=0.1.2c
 version=0.3.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From a337eb10c0a3243a07a2f804d4cbb4c77152ae1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 022/462] VirtualGL: rebuild against OpenSSL

---
 srcpkgs/VirtualGL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 529b42b982936c2cd9dc7e8098fce373ada16232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 023/462] aircrack-ng: rebuild against OpenSSL

---
 srcpkgs/aircrack-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From b6e5310031244078ce2da71d3d9e184ff28ffdcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 024/462] alpine: rebuild against OpenSSL

---
 srcpkgs/alpine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From 976c9cda63723cfc5d369af175095c53ed5d6d32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 025/462] android-file-transfer-linux: rebuild against OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbe..13a20ee4b7a 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 0a59cd99dda51dd3a857a50087eca61d460ffa61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 026/462] apache: rebuild against OpenSSL

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 86dbfd09fbc4f77a2c67bf17d6c84afe54fafbe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 027/462] apk-tools: rebuild against OpenSSL

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..26bcb662e9f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 1d71ca4849b93a6741c195e891408ba48601d2c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 028/462] apr-util: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/apr-util/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1375f975e42..acfe3c2f32c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,7 +687,7 @@ libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
-libaprutil-1.so.0 apr-util-1.3.9_1
+libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..21336257c6c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From d66b54dbd4c04181a43519d10345a58f9591f14f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 029/462] argyllcms: rebuild against OpenSSL

---
 srcpkgs/argyllcms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 31ac5cdb2d2918cacdb07aa6936c73b2cd1dc4d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 030/462] aria2: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/aria2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index acfe3c2f32c..b282e859076 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3073,7 +3073,7 @@ libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
 libzim.so.6 libzim-6.0.1_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
-libaria2.so.0 libaria2-1.33.1_3
+libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
 librpmsign.so.9 librpmsign-4.15.0_1
 librpmbuild.so.9 librpmbuild-4.15.0_1
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From aef41aec661423bc8830a12e90d2675f1d7beb14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 031/462] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From eeecc50a8d3f99dd6bb9dcdee30768adb05a1561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 032/462] axel: rebuild against OpenSSL

---
 srcpkgs/axel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 055407496c76d68cd71936488bb09ecc34b2588e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 033/462] bacula-common: rebuild against OpenSSL

---
 common/shlibs                  | 20 ++++++++++----------
 srcpkgs/bacula-common/template |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b282e859076..21ee88dcd34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2943,16 +2943,16 @@ libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
-libbac-9.4.2.so bacula-common-9.4.2_1
-libbaccfg-9.4.2.so bacula-common-9.4.2_1
-libbacfind-9.4.2.so bacula-common-9.4.2_1
-libbacsql-9.4.2.so bacula-common-9.4.2_1
-libbaccats-9.4.2.so bacula-common-9.4.2_1
-libbacsd-9.4.2.so bacula-common-9.4.2_1
-libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_1
-libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_1
-libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_1
-bpipe-fd.so bacula-fd-9.0.4_1
+libbac-9.4.2.so bacula-common-9.4.2_4
+libbaccfg-9.4.2.so bacula-common-9.4.2_4
+libbacfind-9.4.2.so bacula-common-9.4.2_4
+libbacsql-9.4.2.so bacula-common-9.4.2_4
+libbaccats-9.4.2.so bacula-common-9.4.2_4
+libbacsd-9.4.2.so bacula-common-9.4.2_4
+libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_4
+libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_4
+libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_4
+bpipe-fd.so bacula-fd-9.4.2_4
 libnftables.so.1 libnftables-0.9.1_1
 libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 1a1bb821f748a391a5ee98e243f33e36677f9ac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 034/462] badvpn: rebuild against OpenSSL

---
 srcpkgs/badvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 17d07da1ece9bfb38b6499c9dad5b525911c46e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 035/462] baresip: rebuild against OpenSSL

---
 srcpkgs/baresip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc..7b8adf6f4e0 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From 2ef479aef1fb5b84db2aaee28d9726482d782da5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 036/462] barrier: rebuild against OpenSSL

---
 srcpkgs/barrier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 9c89a4aca8c91aa9f166eb7e67640a8daba82e38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 037/462] bind: rebuild against OpenSSL

---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 21ee88dcd34..7dc94cccc2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1013,13 +1013,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.12.so bind-libs-9.16.12_1
-libdns-9.16.12.so bind-libs-9.16.12_1
-libirs-9.16.12.so bind-libs-9.16.12_1
-libisc-9.16.12.so bind-libs-9.16.12_1
-libisccc-9.16.12.so bind-libs-9.16.12_1
-libisccfg-9.16.12.so bind-libs-9.16.12_1
-libns-9.16.12.so bind-libs-9.16.12_1
+libbind9-9.16.12.so bind-libs-9.16.12_2
+libdns-9.16.12.so bind-libs-9.16.12_2
+libirs-9.16.12.so bind-libs-9.16.12_2
+libisc-9.16.12.so bind-libs-9.16.12_2
+libisccc-9.16.12.so bind-libs-9.16.12_2
+libisccfg-9.16.12.so bind-libs-9.16.12_2
+libns-9.16.12.so bind-libs-9.16.12_2
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98..9ec3bc2241a 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
 hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From b1af91d4fa584e9fddef2e277ba7ba826707aeb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 038/462] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 7c2c83282591ad333b3e7d08e957a33b32b5fa77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 039/462] bitcoin: rebuild against OpenSSL

---
 srcpkgs/bitcoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 0178e7de8726b2968a9f04c55049b8de1c8dbe9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 040/462] blindfold: rebuild against OpenSSL

---
 srcpkgs/blindfold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From e61181b58e7309e328ab746cf0aa9a7e39586c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 041/462] borg: rebuild against OpenSSL

---
 srcpkgs/borg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From edb697f3aba3ad218f3ba57ed7929c58c7adfed4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 042/462] botan: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/botan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7dc94cccc2b..ccaa2340d0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2807,7 +2807,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_1
+libbotan-2.so.16 botan-2.16.0_3
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 097084f5daca3c92adb50d8dc9570d6ce51e054c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 043/462] burp2-server: rebuild against OpenSSL

---
 srcpkgs/burp2-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From 3f47cfb19b8a2dd136d35b7c5734222f33ceaa38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 044/462] butt: rebuild against OpenSSL

---
 srcpkgs/butt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..8777ef98880 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From 88c1e0062d6103815c6386f52de2d5d471f67029 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 045/462] cargo: rebuild against OpenSSL

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From d9c6fe778fbfa0eab341b14e7203ab33e7e7b4e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 046/462] cargo-aoc: rebuild against OpenSSL

---
 srcpkgs/cargo-aoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 904118793d9fff9850e5985b2d756f47787d9295 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 047/462] cargo-crev: rebuild against OpenSSL

---
 srcpkgs/cargo-crev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 69ab0a21561d39a40dfbeaec2c5936ec048dd9fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 048/462] cargo-deny: rebuild against OpenSSL

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From efa0ab7d0fd69a8529cd441b5c4d15f84c51e7ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 049/462] cargo-edit: rebuild against OpenSSL

---
 srcpkgs/cargo-edit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 42924d8b364a3ddc786ef70b5268171edcfa1fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 050/462] cargo-geiger: rebuild against OpenSSL

---
 srcpkgs/cargo-geiger/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 2040be11ed9e4d72a224e1ae3c26cde2f421130b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 051/462] cargo-outdated: rebuild against OpenSSL

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 1673df5b491e0881d141c8610db4dcc3075b24e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 052/462] castor: rebuild against OpenSSL

---
 srcpkgs/castor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 242cfc982b594b30aba69107a35137597fdb2659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 053/462] cbang: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/cbang/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccaa2340d0f..5effa646a8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3806,7 +3806,7 @@ libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
-libcbang0.so cbang-1.3.3_1
+libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 775162148654bc69d8189a22dc67097a02ef5a1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 054/462] chatterino2: rebuild against OpenSSL

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 88e5ac8b101b83e124ba98cf64e7b0c09c7940a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 055/462] cloudfuse: rebuild against OpenSSL

---
 srcpkgs/cloudfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From 5edcb10ec810d1a9fcaeca2bf73bfe55ee0aed88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 056/462] cmusfm: rebuild against OpenSSL

---
 srcpkgs/cmusfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 426c10012c6f1d77b1a11e7f80be4662a9696633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 057/462] coWPAtty: rebuild against OpenSSL

---
 srcpkgs/coWPAtty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From 5e5d00056550adda7f8b4fd6f2298957099015da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 058/462] collectd: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/collectd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5effa646a8c..c086e27fe76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2362,7 +2362,7 @@ libgflags.so.2.2 gflags-2.1.2_1
 libgflags_nothreads.so.2.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
-libcollectdclient.so.1 libcollectdclient-5.5.0_1
+libcollectdclient.so.1 libcollectdclient-5.12.0_3
 libpinktrace_0.9.so.9 pinktrace-0.9.1_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..fe20b20de32 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From ea72a593c3fb6c60c678b492562b960d3db29b79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 059/462] coturn: rebuild against OpenSSL

---
 srcpkgs/coturn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1..077ef7a3600 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 459e046122fb3e788852dd0629db537458808a64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 060/462] cryptsetup: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/cryptsetup/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c086e27fe76..567208278e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1030,7 +1030,7 @@ libcss.so.0 libcss-0.1.1_1
 libhubbub.so.0 libhubbub-0.1.1_1
 liblutok.so.3 lutok-0.4_1
 libmtdev.so.1 mtdev-1.1.2_1
-libcryptsetup.so.12 libcryptsetup-2.0.0_1
+libcryptsetup.so.12 libcryptsetup-2.3.4_2
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From d1e37a05644e5fa520727b247b977d43bbc62055 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 061/462] curl: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/curl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 567208278e7..fe04fc90149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -361,7 +361,7 @@ libfreebl3.so nss-3.12.4_1
 libnssdbm3.so nss-3.12.4_1
 libnssckbi.so nss-3.12.4_1
 libnss3.so nss-3.12.4_1
-libcurl.so.4 libcurl-7.19_1
+libcurl.so.4 libcurl-7.75.0_2
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..48a5fa40596 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From c8ad005904aa712df7b3729d314a9cc2d2779c5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 062/462] cyrus-sasl: rebuild against OpenSSL

---
 srcpkgs/cyrus-sasl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..585ac7a0e94 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 3b882ee396c6f4e5d8096a0e7572ae0391be09e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 063/462] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 00000000000..1ab52f8f5bf
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 00000000000..40f7066dffa
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 00000000000..702ade447f9
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..d2bdc4bf77e 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From d3ddf807da3c0ca4e12bd9ebb0d808a52c9036c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 064/462] dma: rebuild against OpenSSL

---
 srcpkgs/dma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 89bfcd8ff5186ebcd09507485a58b41094758872 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 065/462] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 00000000000..c5769dfc12f
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From f87d9d0dc69e19637b312b36c53f5ae1e158e3cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 066/462] dovecot: rebuild against OpenSSL

---
 common/shlibs            | 12 ++++++------
 srcpkgs/dovecot/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe04fc90149..95d4b00d4ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,12 +1577,12 @@ libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
-libdovecot.so.0 dovecot-2.2.11_2
-libdovecot-login.so.0 dovecot-2.2.11_2
-libdovecot-compression.so.0 dovecot-2.2.11_2
-libdovecot-sql.so.0 dovecot-2.2.11_2
-libdovecot-storage.so.0 dovecot-2.2.11_2
-libdovecot-lda.so.0 dovecot-2.2.11_2
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
 libmysqld.so.18 libmariadbclient-5.5.36_1
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..84819fd693b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
 hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"

From 4cecf60d61cfd5cc15d15d56595a3be1c0beafad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 067/462] dpdk: rebuild against OpenSSL

---
 common/shlibs         | 268 +++++++++++++++++++++---------------------
 srcpkgs/dpdk/template |   6 +-
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 95d4b00d4ce..37f0567c6ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3630,140 +3630,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From ea65f4789700d0a7779bdb3a9dc9e09b40a4570a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 068/462] ecryptfs-utils: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/common/shlibs b/common/shlibs
index 37f0567c6ef..0122864ce8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1094,7 +1094,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
 libvdehist.so.0 libvde2-2.3.2_1
 libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From ea01d9acc8b65c35591c7c8def7451f3ca47cb58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 069/462] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 8e711efeb883398554a59d6fd0ab10c91658d5be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 070/462] efl: rebuild against OpenSSL

---
 common/shlibs        | 78 ++++++++++++++++++++++----------------------
 srcpkgs/efl/template |  4 +--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0122864ce8c..8c7fc32ef9b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1460,42 +1460,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1855,9 +1855,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From de25caf72d3ee594c16863a42042e508341084fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 071/462] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From d5a4766f81b19f5e839ec8de8fd934753fee290e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 072/462] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 8c8d17b78f118fc88ff576b0bfd949a72ec4405c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 073/462] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From 1b6bea41452cae836d12e567740c07e3b28da6d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 074/462] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From f9fbb1251a36e77a408fddeaf2f4769156c19cf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 075/462] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 97670bfde81a2febbddd83a69941d58b2d31eea1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 076/462] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From e8ed01ee45818e246631d88e6433631f5c8bb60d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 077/462] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe681f3d85c2f66f0e99b019d2d0e6208340d6eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 078/462] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 5b5484f7c7f9306c4241a7c98de143c72a0d441d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 079/462] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From 9f9289e7f891e76813739e2ea3e0b5577bf9c917 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 080/462] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From a3af80bc706419ab53cd12c48b13e6059e0cb42f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 081/462] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From 96107058f4c0b837ecfb66508bf267bc090ad640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 082/462] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From fa7370be19c08e95caf3b1c98b9ca2471fa62084 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 083/462] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 646e67b0082e4d5e33e58332bcaf87393ec281c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 084/462] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From bd61e3b61317354435a0c3be72d10a919040747b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 085/462] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From d470cc5961951563bb05c60ddae0cadee38c6a11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 086/462] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 96e70852df3e47db9e5f0fbadb087fa70ad94867 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 087/462] freerdp: rebuild against OpenSSL

---
 common/shlibs            | 26 +++++++++++++-------------
 srcpkgs/freerdp/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c7fc32ef9b..6020e896a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1595,19 +1595,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
 libcppunit-1.14.so.0 libcppunit-1.14.0_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From 055a0132d425abc4ee6666d22f5eb4df30e3e567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 088/462] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From cd852faf613e36e197f80621825595797f74f047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 089/462] gambit: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/gambit/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6020e896a29..5f6d1951d45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3611,7 +3611,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 93616ea128ba1554041ad3cd016b85ad339a7e6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 090/462] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 11e7daeb4e897448cc422ca89e55a433361fa34e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 091/462] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From f7a281b7b290832f5332b5dc265da59a6e0b5815 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 092/462] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From e49d71e26d3a429323493826659d9b1c65ab83a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 093/462] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 50b0f4e46b02ce10d880536d900b6e5324d8b3a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 094/462] getdns: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/getdns/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f6d1951d45..25d333c4959 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3482,10 +3482,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From ab32f3e272082b2d96495e5d2f6d901fb6973416 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 095/462] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From b9f1ea6fd5353edbbb12c11ae44c53b3ca9dd9cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 096/462] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 11112ca3effee6d16ed0032897f3ad3e3f882df2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 097/462] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 9b8fe10836fd9257a7312b9bcf2914b9374bebdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 098/462] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 0352b9ae74f68d6ae3504f1ddc6ec0f5d7a0f7ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 099/462] glusterfs: rebuild against OpenSSL

---
 common/shlibs              | 14 +++++++-------
 srcpkgs/glusterfs/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 25d333c4959..74867352226 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1440,13 +1440,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 35c60dfa4cb84091c6f97bef9c8949f544efa0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 100/462] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From cda441444229a63aea1d5edd459c40066953eb1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 101/462] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From de4d7825f862ab0eeeec1d3dfeccfeea66091f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 102/462] grpc: rebuild against OpenSSL

---
 common/shlibs         | 24 ++++++++++++------------
 srcpkgs/grpc/template |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 74867352226..aab880ea53b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3572,18 +3572,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..708cd5b6518 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=2
+revision=3
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From d1ae089725ba1f2b7615bc1088e7e99a95e65cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 103/462] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From e9712c6fe7876a972efe2cf171befd56ed392258 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 104/462] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 1184ad5d38ab5d8630c7a4f11c04c294262ef497 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 105/462] gst-plugins-bad1: rebuild against OpenSSL

---
 common/shlibs                     | 12 ++++++------
 srcpkgs/gst-plugins-bad1/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aab880ea53b..15c74992708 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,12 +1133,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 6d8575c3bc10ad3f92595ac5165b4f98cdab336c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 106/462] gwenhywfar: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/gwenhywfar/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 15c74992708..82d25d61c60 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1524,11 +1524,11 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1
 libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From ca4fbb34c09cb09d9f9ae4e81ffcb437aaec414e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 107/462] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ff658bd54e4ef8e88053320df2680e98c98e8c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 108/462] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From bb9942cb8230ee564e9d293f461a862b612899ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 109/462] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From bb887d54df5c31beb7912c8726a7d72258306dd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 110/462] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 24659193eacec8bf4d1f7bcebc4b7859bb1cdac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 111/462] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From a4cd1e04c50f5824d5e5bbc497191dd290dbcb5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 112/462] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1580ba61391fc85eda5770ec6a4af82ec6fa1e74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 113/462] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 4cf0ad9a7bd56848f7aa02068a94af6b571dab44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 114/462] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From f301219f6a3e723ea309d7a369773fa0637d695e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 115/462] httrack: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/httrack/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 82d25d61c60..3e8eb3a53ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2147,8 +2147,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From f16cb577025e94f880f3311035e1d6fdbde06b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 116/462] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 0367b0bbedede68c2563e3c398a83d2c9663148a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 117/462] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d63ab397d219e1f95cda4f461b5bd6f58da33d7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 118/462] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From cd84cdc17ec37fea4e70b215b4ffa4460ec9644e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 119/462] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From f5adff41926e05f2a1c14d7c138336df5a225521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 120/462] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 8f0a3ef281047f48ab1c7d323b6b834c327678c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 121/462] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 79b37eeef8ed6a6cde291ac56785909dd268d54d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 122/462] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From d36470faf49684ef5167ac81bbcd0d68d62d933b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 123/462] ipmiutil: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/ipmiutil/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e8eb3a53ed..db59c3ecd3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2575,7 +2575,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From a78182d3177520e4a6c79a4c6ad5a177f35f9c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 124/462] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c31492853d1b3f2c1de00b4f25432b7ba2c2b4c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 125/462] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 5858ebfef362724e53b30903836773c5ceadf8f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 126/462] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 05b457a3753726cce7879031b8cb4e31345dc7c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 127/462] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From 5a5b85e24dfcafdea424ee90620970a3004e29fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 128/462] kea: change botan build-option to use OpenSSL

---
 common/shlibs        | 40 ++++++++++++++++++++--------------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db59c3ecd3c..b1ea4fcf930 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2831,26 +2831,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
 libkj-async-0.8.0.so capnproto-0.8.0_1
 libkj-test-0.8.0.so capnproto-0.8.0_1
 libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_1
-libkea-http.so.23 libkea-1.9.4_1
-libkea-log.so.18 libkea-1.9.4_1
-libkea-pgsql.so.18 libkea-1.9.4_1
-libkea-process.so.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 3d961d1e4a462f380cc1ce799730800c3d4e67d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 129/462] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e72838017ab03335bf6cb3159a334721a4008e29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 130/462] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From b967a8fa476122497a250a285adf13d9dbebc896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 131/462] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From e8f23f515d92467a295827a155af83df8e967645 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 132/462] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 3a1ae4d6e7d349c4e4497dc492508397f0e8bd81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 133/462] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 9a4e883608555abade6ddc773b417c879f5f3bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 134/462] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From e9615f5a1591a677156036faee1826cc0e545635 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 135/462] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 56c55f3464fca212c213e479efa872f077149a34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 136/462] ldns: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ldns/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b1ea4fcf930..5a13a319c2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,7 +2000,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 2b8938ed09fba4ee589caa8d9f4b4aa4888e376c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 137/462] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d59f802df33ab8aa9b5ed0c23eb48ed3174ea500 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 138/462] libarchive: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libarchive/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5a13a319c2d..dd1248160f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -49,7 +49,7 @@ libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
-libarchive.so.13 libarchive-3.3.3_5
+libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
 libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From c0bc3a98177e10ac0236ce3cac294dccd5f1e486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 139/462] libesmtp: rebuild against OpenSSL

---
 common/shlibs                          |  2 +-
 srcpkgs/libesmtp/patches/openssl.patch | 50 ++++++++++++++++++++++++++
 srcpkgs/libesmtp/template              |  4 +--
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libesmtp/patches/openssl.patch

diff --git a/common/shlibs b/common/shlibs
index dd1248160f7..69a71b31d50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1323,7 +1323,7 @@ libre2.so.7 re2-2020.06.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
-libesmtp.so.6 libesmtp-1.0.6_4
+libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
 libunwind.so.8 libunwind-1.1_1
diff --git a/srcpkgs/libesmtp/patches/openssl.patch b/srcpkgs/libesmtp/patches/openssl.patch
new file mode 100644
index 00000000000..9244e390059
--- /dev/null
+++ b/srcpkgs/libesmtp/patches/openssl.patch
@@ -0,0 +1,50 @@
+--- configure	2021-02-13 22:19:40.127583919 +0100
++++ -	2021-02-13 22:25:30.535900276 +0100
+@@ -11896,9 +11896,9 @@
+ 
+ fi
+ if test x$with_openssl != xno ; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11913,27 +11913,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then :
+ 
+ 				with_openssl=yes
+ 				LIBS="-lssl -lcrypto $LIBS"
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 9b8b0de35a3d43073f6441720005f91f4ee2c264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 140/462] libetpan: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libetpan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69a71b31d50..2701a5a792e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2139,7 +2139,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From a176b933918b7210670daeafcf1fcb2985577efe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 141/462] libevent: rebuild against OpenSSL

---
 common/shlibs             | 10 +++++-----
 srcpkgs/libevent/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2701a5a792e..c9c6f12a695 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -680,11 +680,11 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.1.so.7 libevent-2.1.11_1
-libevent_core-2.1.so.7 libevent-2.1.11_1
-libevent_extra-2.1.so.7 libevent-2.1.11_1
-libevent_pthreads-2.1.so.7 libevent-2.1.11_1
-libevent_openssl-2.1.so.7 libevent-2.1.11_1
+libevent-2.1.so.7 libevent-2.1.12_2
+libevent_core-2.1.so.7 libevent-2.1.12_2
+libevent_extra-2.1.so.7 libevent-2.1.12_2
+libevent_pthreads-2.1.so.7 libevent-2.1.12_2
+libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 988e868a545e10cbe7d556f85d3bb57b52894e80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 142/462] libfetch: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfetch/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c9c6f12a695..0b29dd1a46a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -753,7 +753,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4069cbd3b19c76d16be60caa9ae041f76936b6b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 143/462] libfido2: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfido2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b29dd1a46a..d3bdd768276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3803,7 +3803,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 45f0246add5c089826406d4f42de9f69ec56c905 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 144/462] libgda: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/libgda/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3bdd768276..8b07fc46161 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1395,10 +1395,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From c5080c7165b9773bf96796608bcdf399a3cd607e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 145/462] libgit2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgit2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b07fc46161..2591b01a24b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1338,7 +1338,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1
 libunwind-setjmp.so.0 libunwind-1.4_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
-libgit2.so.1.0 libgit2-1.0.0_1
+libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From 57cc22ebe24601ddfe6f245423259ed2c88f4bbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 146/462] libimobiledevice: rebuild against OpenSSL

---
 common/shlibs                     | 2 +-
 srcpkgs/libimobiledevice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2591b01a24b..a767d7888e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1997,7 +1997,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac81b83fcb544e307d5106e28ce17c4cf8f826e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 147/462] libircclient: rebuild against OpenSSL

---
 common/shlibs                 | 2 +-
 srcpkgs/libircclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a767d7888e4..d031ce2a12f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 207bbdffaf418a7a5e8eac076a31acb9d3c7e87c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 148/462] libknet1: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/libknet1/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d031ce2a12f..577bfdfddd8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3617,11 +3617,11 @@ libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 37b229a94e749fa2362ef19bfb3a02c4a804e64b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 149/462] libmowgli: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libmowgli/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 577bfdfddd8..6a37071e657 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1110,7 +1110,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From e91956b2a0aced6747f07329d3e1265acf8bfdf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 150/462] libnice: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libnice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6a37071e657..4eeb96cd81a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -801,7 +801,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 75fa8148a76be87d3e76c1288b22fe1ee88de3b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 151/462] libostree: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libostree/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4eeb96cd81a..2346e95843a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2919,7 +2919,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From c3e9ab93b75d9974b18666c3e67efa2a9e458779 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 152/462] librdkafka: rebuild against OpenSSL

---
 common/shlibs               | 4 ++--
 srcpkgs/librdkafka/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2346e95843a..55c18ee909f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3788,8 +3788,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From b97cf082a470b080a9b6655fea9259572c87c520 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 153/462] libssh: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libssh/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 55c18ee909f..342f653031f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1366,7 +1366,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8f9db9e9545d5ebd01841df6aa3279413f8b47e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 154/462] libssh2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libssh2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 342f653031f..6137c67d370 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1061,7 +1061,7 @@ libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
-libssh2.so.1 libssh2-1.4.1_1
+libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
 libsnmp.so.40 libnet-snmp-5.9_1
 libnetsnmp.so.40 libnet-snmp-5.9_1
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 79e2ed3aadc98d1a59679be70167b6bd6e6c3c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 155/462] libstrophe: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libstrophe/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6137c67d370..f190fe4cf38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1790,7 +1790,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 7408328b6e8aa98d629bde0ff6c786166b1f1fcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 156/462] libtd: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f190fe4cf38..f44b9f76ba8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3852,7 +3852,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 64a4028c4cc04210737c1dc55a178710c84714d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 157/462] libtorrent: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libtorrent/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f44b9f76ba8..3dc834a5a51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,7 +819,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From d690f7088743e95c24b86a293ca7396b02e48a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 158/462] libtorrent-rasterbar: rebuild against OpenSSL

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3dc834a5a51..295bf8965d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2004,7 +2004,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 0daabdcb0a84283a5c7b8bdbb2dfd07458b07f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 159/462] libu2f-host: rebuild against OpenSSL

---
 common/shlibs                | 2 +-
 srcpkgs/libu2f-host/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 295bf8965d4..a15b0b73706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2419,7 +2419,7 @@ libboinc_graphics2.so.7 boinc-nox-7.6.2_1
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fa3ad0fe17af516d111775cfc6eb216981fbe932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 160/462] libu2f-server: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libu2f-server/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a15b0b73706..b4699ece480 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,7 +2420,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 88010b5816a752c8676a02aed3cf8689a37a5ac1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 161/462] libucl: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/common/shlibs b/common/shlibs
index b4699ece480..2aa8b56ad30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1840,7 +1840,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From 46910b2ea0b4882e83e33f3b4585e2e976a354dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 162/462] libwebsockets: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libwebsockets/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2aa8b56ad30..c3111bb9ed9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2162,7 +2162,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 809f0e9a40059f439b314b98875907cbe4d3a44b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 163/462] libzip: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libzip/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3111bb9ed9..70396a572bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1211,7 +1211,7 @@ libtinyxml.so.0 tinyxml-2.6.2_1
 libtinyxml2.so.8 tinyxml2-8.0.0_1
 libbluray.so.2 libbluray-1.0.0_1
 libnfs.so.13 libnfs-4.0.0_1
-libzip.so.5 libzip-1.2_1
+libzip.so.5 libzip-1.7.3_2
 libluajit-5.1.so.2 LuaJIT-2.0.0_1
 libOSMesa.so.8 libOSMesa-9.1_1
 libtaginfo.so.1 libtaginfo-0.1.3_1
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 01e148c241561027ae4647170db214b8cba22a99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 164/462] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 5b52471bdb2b47d2bf51ab8a2ab7ab11abba31a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 165/462] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 710408f63279ff56185c7b9052a2053df01f0a69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 166/462] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From a92dc8178e1cea3dbdebb008b54bf46a849027da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 167/462] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 335eaa4afdd0bf2270b01cfac1b28813c625d664 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 168/462] live555: rebuild against OpenSSL

---
 common/shlibs            | 8 ++++----
 srcpkgs/live555/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 70396a572bc..a6653680b71 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2963,10 +2963,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From ce121e74d0d4934cf03f9ac7b3ae7df4e12cb7f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/462] loudmouth: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/loudmouth/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6653680b71..ba1a05c801e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2003,7 +2003,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 1355e389c3f062d3c3396621ad345aa5e5e98c17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/462] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From cce8e3f6c1e0e69e4dd38eb7d98feea45b727780 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/462] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From bcbdd22e6079a29af2ddf09e8a44cefc11eac996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/462] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 84c5027d28751e56542bab0dadfd7ff78958956a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/462] mariadb: rebuild against OpenSSL

---
 common/shlibs            | 6 +++---
 srcpkgs/mariadb/template | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ba1a05c801e..173ef43e85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libecpg.so.6 postgresql-libs-8.4.2_1
 libpgtypes.so.3 postgresql-libs-8.4.2_1
 libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
-libmysqlclient.so.18 libmariadbclient-10.1.47_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
+libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -1583,7 +1583,7 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
+libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..437ff757b38 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 3a62c31594be45b4426546423da903cdffdc73b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/462] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 364f624a7f9e6a45c8dec8b6cb79931101a6686e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/462] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From dc0f13d7c857fc79fff59e62e6361ec9597ed426 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/462] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 3d088365c871cdd996776f885d92f29c981746aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/462] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 4c99008f426c3398c79b3bac2a225d5af0133482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/462] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 36071b026a78e89a19efbcade216c9f4e09d8f8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/462] mit-krb5: rebuild against OpenSSL

---
 common/shlibs             | 24 ++++++++++++------------
 srcpkgs/mit-krb5/template |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 173ef43e85b..86648767605 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,18 +560,18 @@ libpq.so.5 postgresql-libs-8.4.2_1
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
-libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
-libgssrpc.so.4 mit-krb5-libs-1.8_1
-libk5crypto.so.3 mit-krb5-libs-1.8_1
-libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.2_1
-libkadm5srv_mit.so.12 mit-krb5-libs-1.18.2_1
-libkdb5.so.10 mit-krb5-libs-1.18.2_1
-libkrb5.so.3 mit-krb5-libs-1.8_1
-libkrad.so.0 mit-krb5-libs-1.12.1_1
-libkrb5support.so.0 mit-krb5-libs-1.8_1
-libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
-libverto.so.0 mit-krb5-libs-1.8_1
-libverto-k5ev.so.0 mit-krb5-libs-1.8_1
+libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
+libgssrpc.so.4 mit-krb5-libs-1.18.3_2
+libk5crypto.so.3 mit-krb5-libs-1.18.3_2
+libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2
+libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2
+libkdb5.so.10 mit-krb5-libs-1.18.3_2
+libkrb5.so.3 mit-krb5-libs-1.18.3_2
+libkrad.so.0 mit-krb5-libs-1.18.3_2
+libkrb5support.so.0 mit-krb5-libs-1.18.3_2
+libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2
+libverto.so.0 mit-krb5-libs-1.18.3_2
+libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2
 libmenu-cache.so.3 menu-cache-1.0.0_1
 libupower-glib.so.3 libupower-glib3-0.99.3_1
 libcanberra.so.0 libcanberra-0.23_1
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 02c544051edd9bd16214b1297b5a787192208a68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/462] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 37a2c4dc4c56867407561fc3c71c91eb83ef412e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/462] mongo-c-driver: rebuild against OpenSSL

---
 common/shlibs                   | 2 +-
 srcpkgs/mongo-c-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86648767605..a7f794d73e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3858,7 +3858,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 liburing.so.1 liburing-0.7_1
-libbson-1.0.so.0 libbson-1.17.0_1
+libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 66fee33e79f20b50d0c942ec8dc4b061027aec03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 182/462] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 26b4be8e5481638adbe606df63bf539d052d30fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/462] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 40418543fe251ef9d2cff5b923c8cbe0065633f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/462] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From c9695f26f97a93621f54ba1811c05e3c551f5e0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/462] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From b80ead042b28a5ae76305e7d65f9c035fe37e7cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 186/462] mosquitto: rebuild against OpenSSL

---
 common/shlibs              | 4 ++--
 srcpkgs/mosquitto/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7f794d73e3..a7b941c9fec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2116,8 +2116,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.1 mpv-0.8.0_2
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 409a9ce1a1949fc45b8fe4246fbf7817ce928ff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/462] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 55bf1802aa55488bf3055528e2e07864e98a1e01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/462] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 35a1c243ee9e857eb3fac9979d9d45019633a024 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/462] mtxclient: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7b941c9fec..72bacd2baf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From deca9d3c4da5140e09998a81531021495282eebc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 190/462] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 9a27db572a190ae9fec3c2e20230d5a009ed95af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/462] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From b803b03896312b2d791b1db4901040ce0a3b2ccd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/462] munge: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/munge/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 72bacd2baf3..57da86ac3e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2496,7 +2496,7 @@ libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
 libaudiofile.so.1 audiofile-0.3.6_1
 libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.8 libmgba-0.8.1_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From ed9996d926624d03e6c59df808912f98b6b2bcfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/462] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From ee1b3c66a0aee2b8b1a2b2a8b7d9530987caeb9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/462] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From a0d77b90a1e19186299f5c349c19273d6d620d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 195/462] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 04637192e5b98e744bd40939c5693a612c738ccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/462] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From b20182aab4c84db0d833b09e7d1fa81f02862e6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/462] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 26c95fa9a18cda6d4017a880cc9acb7838b2da4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/462] neon: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/neon/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 57da86ac3e5..49f005001bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -754,7 +754,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 96c034656d1be6bf93dc66f1fcdf142892ef4b09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 199/462] net-snmp: rebuild against OpenSSL

---
 common/shlibs             | 12 ++++++------
 srcpkgs/net-snmp/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 49f005001bb..15614f839ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1063,12 +1063,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmpagent.so.40 libnet-snmp-5.9_1
-libnetsnmpmibs.so.40 libnet-snmp-5.9_1
-libnetsnmptrapd.so.40 libnet-snmp-5.9_1
-libnetsnmphelpers.so.40 libnet-snmp-5.9_1
+libsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmpagent.so.40 libnet-snmp-5.9_2
+libnetsnmpmibs.so.40 libnet-snmp-5.9_2
+libnetsnmptrapd.so.40 libnet-snmp-5.9_2
+libnetsnmphelpers.so.40 libnet-snmp-5.9_2
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From 21424f4a06c5d5cc64c5cea3615af78dc3a39032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/462] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 89e9afe6dcfe214e9f8d0b74f5aeb98077de75e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/462] netpgp: rebuild against OpenSSL

---
 common/shlibs                                 |   4 +-
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 4 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/common/shlibs b/common/shlibs
index 15614f839ff..26adc4c8a9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -688,8 +688,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
 libmca_common_dstore.so.1 libopenmpi-4.0.1_1
 libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 76d82a8586d6f548218c7ec719228aa7cfebbd8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/462] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 7db14dcffba75f992e3a9a4bc360eee6dfff10bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/462] network-ups-tools: rebuild against OpenSSL

---
 common/shlibs                                 |   6 +-
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/common/shlibs b/common/shlibs
index 26adc4c8a9e..e7474756396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1656,9 +1656,9 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
-libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
-libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
 libsphinxad.so.0 sphinxbase-0.8_1
 libsphinxbase.so.1 sphinxbase-0.8_1
 libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From c761f31a02948e5c88622ce8107e0dd38a8c4b67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 204/462] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From d350c1a7c5f6ce4dcfd4f45d2196241e359d4fae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/462] nghttp2: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/nghttp2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e7474756396..5ed762a8f57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2190,7 +2190,7 @@ libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
-libnghttp2.so.14 nghttp2-1.0.2_1
+libnghttp2.so.14 nghttp2-1.43.0_2
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af9..a4ec485e23e 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From 1417d496b784465e988b89bdb713f5a7a8a1ff94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/462] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 69b09558ae599385765eb9ea52c3389e0553a7e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/462] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8160105c2cd5220cd54eb5a8a536eaea2bc553c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 208/462] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From e1b1b1ca426b292df4925a944be8e8f2f0dd0bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/462] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From bbc128e97cb8da79b67f3499b5917b520185b8d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/462] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From ed6588eba720fb641c9f871cdacaf86f62a26446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/462] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 062bd1d6bdd543d3f9aa27034e15f24753256e5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 212/462] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 3abc19bee985f50aa73e099ccb73d26e641cdbc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/462] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 4acee5668cfe40544b1c50e722102717dcbaece9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/462] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From e9e3b4b4524ef17b0aebf2438426444985d63781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/462] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 09685ca97fcdbdcf8ef52f7513631ddf1a69177d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/462] open-isns: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/open-isns/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5ed762a8f57..ebdf2d86924 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2790,7 +2790,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
 libKF5KrossCore.so.5 kross-5.26.0_1
 libKF5KrossUi.so.5 kross-5.36.0_1
 liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From e00b57345368130173f353bffab6cfff4e5c8a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 217/462] opendkim: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 3 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/common/shlibs b/common/shlibs
index ebdf2d86924..627e5922023 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2664,7 +2664,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From a6f6331ffa0febfc1ea9dd2fa0bc4485e9082518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/462] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From fd1cd64a6c0e9fa844774cb9585965928a7a642f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/462] openldap: rebuild against OpenSSL

---
 common/shlibs             | 6 +++---
 srcpkgs/openldap/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 627e5922023..af8d19893fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -677,9 +677,9 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
 libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber-2.4.so.2 libldap-2.4.57_2
+libldap-2.4.so.2 libldap-2.4.57_2
+libldap_r-2.4.so.2 libldap-2.4.57_2
 libevent-2.1.so.7 libevent-2.1.12_2
 libevent_core-2.1.so.7 libevent-2.1.12_2
 libevent_extra-2.1.so.7 libevent-2.1.12_2
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c..ba4e3cee2e6 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 621e1aa85f539e98cd876eddbf076a931e4ff8a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/462] opensc: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index af8d19893fa..05ecfc4ff8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1713,7 +1713,7 @@ libLinearMath.so.2.89 bullet-2.89_1
 libBulletSoftBody.so.2.89 bullet-2.89_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a74cfcfb1302e772db95e5daf2abac1ac2d55e32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 221/462] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From c85e3811b1d1affcb1af38ac4ddc0e323d82e1cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/462] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From c6b97ec0769b05f9e02127ecc0fb256cb515e30c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/462] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From d4e51e2ba0bdd669a19d4f2a02aad464915d28ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/462] opkg: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/opkg/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 05ecfc4ff8a..b0d64c819b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3510,7 +3510,7 @@ libvkd3d.so.1 vkd3d-1.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 32abae57e863d31246bc1b984596f7097bacbd28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 225/462] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From 6aad7bbfbe0e07cd65915a6e99d1bae77afb9d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/462] opusfile: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/opusfile/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b0d64c819b8..77f5ec4e9d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1201,8 +1201,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 41f6f1a9ddc72f50f67eaabe62424df1e72cfb11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/462] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From e9349f01b72df56cc74b690b7079e04a3dab807d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/462] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From f72a1c2cb734c9d8694cf0828fad8fabcc566964 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/462] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 725eac56adaf9f4a5f7aeae23058dc9cd662ce1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 230/462] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From a0b5c94b3995c1aade066180d01f238dfffb028e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/462] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From bf7f1e0e71f167e87ee92bb4162742618870953c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/462] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 95724113e406a86c4f845828a3bcb69bf9d79cb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/462] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a795907a59150e2ff0e61a3f951a3fd02858cac0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/462] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 05509edc39241239cbbe8d4510ab1a333e178adb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 235/462] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From ac9232d0be9976c345161378b5e02205496b49ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/462] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 054286eea27f284ca002c9cfbf0890889e405be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/462] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From ed780037a6277378847a0b525494ba68e081256b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/462] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 76d3297bc76407a3a4a49ff31fde4817baecbb91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/462] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From ce811b85a5de9e58a3008a11fe1b0cc73037ab1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 240/462] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 9d81cd393b76ac543268ed1e55635a10379a2401 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/462] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 06f23b8f31d96a98bb7f8da38a44aec67716cd81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 242/462] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From d33909f6257b63eda9bb922436c154b30e5eecf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/462] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From c9e153d3aee00f741fb83a7f50acf6f354e5f8a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/462] pjproject: rebuild against OpenSSL

---
 common/shlibs              | 28 ++++++++++++++--------------
 srcpkgs/pjproject/template |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 77f5ec4e9d7..050af469a98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2465,20 +2465,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 9a91ebb05ab98b43ffd26662ed001564b6b7697b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/462] pkcs11-helper: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/pkcs11-helper/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 050af469a98..8b3e2fdb551 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3085,7 +3085,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
 libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
 libr_cons.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 44d6dcefc2868c20c68588ce54fe578fc2abe23a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/462] poco: rebuild against OpenSSL

---
 common/shlibs         | 26 +++++++++++++-------------
 srcpkgs/poco/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b3e2fdb551..a6a894c3874 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2926,19 +2926,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 168abf690e075a9fd25e9b0485ff9eee308af0cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 247/462] podofo: rebuild against OpenSSL

---
 common/shlibs           | 2 ++
 srcpkgs/podofo/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6a894c3874..2cf26d5a163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2518,6 +2518,8 @@ libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-5.0.4_1
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
+libseafile.so.0 seafile-libclient-7.0.10_2
+libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..2fdc03e3153 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 52bce0edf80192cf62d372b70f9f296243f23c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/462] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 6e640ae483779b0e57c1f07ae3f6b765f9c24744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/462] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c15b6298a3e3f5d28419a06555394c13d72fd4d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 250/462] postgresql13: rebuild against OpenSSL

---
 common/shlibs                 | 8 ++++----
 srcpkgs/postgresql13/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2cf26d5a163..e3f8216af1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -553,10 +553,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.2 pulseaudio-qt-1.1.0_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-8.4.2_1
-libecpg.so.6 postgresql-libs-8.4.2_1
-libpgtypes.so.3 postgresql-libs-8.4.2_1
-libpq.so.5 postgresql-libs-8.4.2_1
+libecpg_compat.so.3 postgresql-libs-13.2_2
+libecpg.so.6 postgresql-libs-13.2_2
+libpgtypes.so.3 postgresql-libs-13.2_2
+libpq.so.5 postgresql-libs-13.2_2
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..3c0b8fb730b 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 3444ebdad9f2566a07342fbc4ee43678bed8edfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/462] ppp: rebuild against OpenSSL

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 82567e75fefbf327dca49c72bd94030e5c8b99a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/462] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 991308c31f7240d8f2fccc3ffd7385b127b7c587 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/462] pulseaudio: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/pulseaudio/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e3f8216af1b..6224bac7522 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -728,11 +728,11 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-1.0_1
-libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
-libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-14.2.so libpulseaudio-14.2_1
-libpulsecore-14.2.so libpulseaudio-14.2_1
+libpulse.so.0 libpulseaudio-14.2_2
+libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
+libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulsecommon-14.2.so libpulseaudio-14.2_2
+libpulsecore-14.2.so libpulseaudio-14.2_2
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b70..01ddc8ed732 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 9701e952fc20b68c3a138deb77bcc02ba376f668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 254/462] python: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/python/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6224bac7522..d371e47a2f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
-libpython2.7.so.1.0 python-2.7_1
+libpython2.7.so.1.0 python-2.7.18_3
 libffi.so.7 libffi-3.3_1
 libffcall.so.0 ffcall-2.1_1
 libavcall.so.1 ffcall-2.1_1
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From ce3d240de399d797589eb0de6166c4a72b11fb67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/462] python-M2Crypto: rebuild against OpenSSL

---
 srcpkgs/python-M2Crypto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c233be98cab7107b3cf5deb88a056161e7305fbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/462] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 097b088d4ac9a5f717d7c8f033e88503cce4cf05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/462] python3: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/python3/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d371e47a2f8..3b7f4056289 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1734,8 +1734,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.8.0_1
-libpython3.9.so.1.0 python3-3.9.0_1
+libpython3.so python3-3.9.2_2
+libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a9519..9fa79661ba8 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 0ef19a3b0aa7b461d9964693233d886d0da88fb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/462] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 2ec0782780c3993798eae636457cbc3df1fa374a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 259/462] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From f969ab331014b8d96369494f91efb676d6a9f458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/462] qca-qt5: rebuild against OpenSSL

---
 common/shlibs            | 10 ++++++++++
 srcpkgs/qca-qt5/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b7f4056289..d9d6ad7d847 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,6 +2176,16 @@ libclamunrar.so.9 clamav-0.101.0_1
 libclamunrar_iface.so.9 clamav-0.101.0_1
 libfreshclam.so.2 clamav-0.102.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From d6e77eabb0403dd1f21829fc79d48536b97a18f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/462] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From 10903782dc88366e5cc58497f5ece4fe5dda2757 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 262/462] qt5: rebuild against OpenSSL

---
 common/shlibs                                 | 154 +++----
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 3 files changed, 81 insertions(+), 503 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/common/shlibs b/common/shlibs
index d9d6ad7d847..f0a801eb276 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1897,87 +1897,87 @@ libgltf-0.1.so.1 libgltf-0.1.0_1
 libabw-0.1.so.1 libabw-0.1.0_1
 libcmis-0.5.so.5 libcmis-0.5.0_1
 libcmis-c-0.5.so.5 libcmis-0.5.0_1
-libQt5Bluetooth.so.5 qt5-connectivity-5.15.0_1
-libQt53DAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DCore.so.5 qt5-3d-5.15.0_1
-libQt53DInput.so.5 qt5-3d-5.15.0_1
-libQt53DLogic.so.5 qt5-3d-5.15.0_1
-libQt53DRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuick.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt53DQuickRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuickScene2D.so.5 qt5-3d-5.15.0_1
-libQt53DExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt5Charts.so.5 qt5-charts-5.15.0_1
-libQt5DataVisualization.so.5 qt5-datavis3d-5.15.0_1
-libQt5Gamepad.so.5 qt5-gamepad-5.15.0_1
-libQt5Nfc.so.5 qt5-connectivity-5.15.0_1
+libQt5Bluetooth.so.5 qt5-connectivity-5.15.2_3
+libQt53DAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DCore.so.5 qt5-3d-5.15.2_3
+libQt53DInput.so.5 qt5-3d-5.15.2_3
+libQt53DLogic.so.5 qt5-3d-5.15.2_3
+libQt53DRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuick.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt53DQuickRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3
+libQt53DExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt5Charts.so.5 qt5-charts-5.15.2_3
+libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3
+libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3
+libQt5Nfc.so.5 qt5-connectivity-5.15.2_3
 libQt5WebView.so.5 qt5-webview-5.15.0_1
-libQt5Qml.so.5 qt5-declarative-5.15.0_1
-libQt5QmlDevTools.so.5 qt5-declarative-5.15.0_1
-libQt5Quick.so.5 qt5-declarative-5.15.0_1
-libQt5QuickTest.so.5 qt5-declarative-5.15.0_1
-libQt5QuickWidgets.so.5 qt5-declarative-5.15.0_1
-libQt5QuickParticles.so.5 qt5-declarative-5.15.0_1
-libQt5QuickShapes.so.5 qt5-declarative-5.15.0_1
-libQt5QmlModels.so.5 qt5-declarative-5.15.0_1
-libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.0_1
-libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Positioning.so.5 qt5-location-5.15.0_1
-libQt5Location.so.5 qt5-location-5.15.0_1
-libQt5PositioningQuick.so.5 qt5-location-5.15.0_1
-libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.0_1
-libQt5Multimedia.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.0_1
-libQt5NetworkAuth.so.5 qt5-networkauth-5.15.0_1
-libQt5Purchasing.so.5 qt5-purchasing-5.15.0_1
-libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.0_1
-libqgsttools_p.so.1 qt5-multimedia-5.15.0_1
-libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Scxml.so.5 qt5-scxml-5.15.0_1
-libQt5Script.so.5 qt5-script-5.15.0_1
-libQt5ScriptTools.so.5 qt5-script-5.15.0_1
-libQt5Sensors.so.5 qt5-sensors-5.15.0_1
-libQt5SerialBus.so.5 qt5-serialbus-5.15.0_1
-libQt5SerialPort.so.5 qt5-serialport-5.15.0_1
-libQt5Svg.so.5 qt5-svg-5.15.0_1
-libQt5CLucene.so.5 qt5-tools-5.15.0_1
-libQt5Help.so.5 qt5-tools-5.15.0_1
-libQt5Designer.so.5 qt5-tools-5.15.0_1
-libQt5DesignerComponents.so.5 qt5-tools-5.15.0_1
-libQt5WaylandClient.so.5 qt5-wayland-5.15.0_1
-libQt5WaylandCompositor.so.5 qt5-wayland-5.15.0_1
-libQt5WebChannel.so.5 qt5-webchannel-5.15.0_1
+libQt5Qml.so.5 qt5-declarative-5.15.2_3
+libQt5QmlDevTools.so.5 qt5-declarative-5.15.2_3
+libQt5Quick.so.5 qt5-declarative-5.15.2_3
+libQt5QuickTest.so.5 qt5-declarative-5.15.2_3
+libQt5QuickWidgets.so.5 qt5-declarative-5.15.2_3
+libQt5QuickParticles.so.5 qt5-declarative-5.15.2_3
+libQt5QuickShapes.so.5 qt5-declarative-5.15.2_3
+libQt5QmlModels.so.5 qt5-declarative-5.15.2_3
+libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.2_3
+libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Positioning.so.5 qt5-location-5.15.2_3
+libQt5Location.so.5 qt5-location-5.15.2_3
+libQt5PositioningQuick.so.5 qt5-location-5.15.2_3
+libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.2_3
+libQt5Multimedia.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.2_3
+libQt5NetworkAuth.so.5 qt5-networkauth-5.15.2_3
+libQt5Purchasing.so.5 qt5-purchasing-5.15.2_3
+libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.2_3
+libqgsttools_p.so.1 qt5-multimedia-5.15.2_3
+libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Scxml.so.5 qt5-scxml-5.15.2_3
+libQt5Script.so.5 qt5-script-5.15.2_3
+libQt5ScriptTools.so.5 qt5-script-5.15.2_3
+libQt5Sensors.so.5 qt5-sensors-5.15.2_3
+libQt5SerialBus.so.5 qt5-serialbus-5.15.2_3
+libQt5SerialPort.so.5 qt5-serialport-5.15.2_3
+libQt5Svg.so.5 qt5-svg-5.15.2_3
+libQt5CLucene.so.5 qt5-tools-5.15.2_3
+libQt5Help.so.5 qt5-tools-5.15.2_3
+libQt5Designer.so.5 qt5-tools-5.15.2_3
+libQt5DesignerComponents.so.5 qt5-tools-5.15.2_3
+libQt5WaylandClient.so.5 qt5-wayland-5.15.2_3
+libQt5WaylandCompositor.so.5 qt5-wayland-5.15.2_3
+libQt5WebChannel.so.5 qt5-webchannel-5.15.2_3
 libQt5WebEngineCore.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngine.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngineWidgets.so.5 qt5-webengine-5.15.0_1
-libQt5WebSockets.so.5 qt5-websockets-5.15.0_1
-libQt5X11Extras.so.5 qt5-x11extras-5.15.0_1
-libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.0_1
-libQt5Core.so.5 qt5-core-5.15.0_1
-libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5Network.so.5 qt5-network-5.15.0_1
-libQt5Sql.so.5 qt5-sql-5.15.0_1
-libQt5Xml.so.5 qt5-xml-5.15.0_1
-libQt5Gui.so.5 qt5-gui-5.15.0_1
-libQt5Widgets.so.5 qt5-widgets-5.15.0_1
-libQt5Test.so.5 qt5-test-5.15.0_1
-libQt5DBus.so.5 qt5-dbus-5.15.0_1
-libQt5Concurrent.so.5 qt5-concurrent-5.15.0_1
-libQt5OpenGL.so.5 qt5-opengl-5.15.0_1
-libQt5PrintSupport.so.5 qt5-printsupport-5.15.0_1
-libQt5XcbQpa.so.5 qt5-gui-5.15.0_1
-libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.0_1
-libQt5TextToSpeech.so.5 qt5-speech-5.15.0_1
-libQt5Bodymovin.so.5 qt5-lottie-5.15.0_1
+libQt5WebSockets.so.5 qt5-websockets-5.15.2_3
+libQt5X11Extras.so.5 qt5-x11extras-5.15.2_3
+libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.2_3
+libQt5Core.so.5 qt5-core-5.15.2_3
+libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5Network.so.5 qt5-network-5.15.2_3
+libQt5Sql.so.5 qt5-sql-5.15.2_3
+libQt5Xml.so.5 qt5-xml-5.15.2_3
+libQt5Gui.so.5 qt5-gui-5.15.2_3
+libQt5Widgets.so.5 qt5-widgets-5.15.2_3
+libQt5Test.so.5 qt5-test-5.15.2_3
+libQt5DBus.so.5 qt5-dbus-5.15.2_3
+libQt5Concurrent.so.5 qt5-concurrent-5.15.2_3
+libQt5OpenGL.so.5 qt5-opengl-5.15.2_3
+libQt5PrintSupport.so.5 qt5-printsupport-5.15.2_3
+libQt5XcbQpa.so.5 qt5-gui-5.15.2_3
+libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.2_3
+libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
+libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.192 x265-3.4_1
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..61317092801 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
  libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 746b305f3b46a35eaaf76b5acc323dae19a301eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/462] rabbitmq-c: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/rabbitmq-c/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f0a801eb276..241b56bc342 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From bf82868f879703209224d336659cb051ffdd61cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/462] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From b566ca6a10e2c31922b79f5d1d843940c02c7181 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 265/462] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From 9baf422eb3768b710d1f41e0bbb292d08a7a5956 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 266/462] re: rebuild against OpenSSL

---
 common/shlibs       | 2 +-
 srcpkgs/re/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 241b56bc342..ea0d6b61b1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3387,7 +3387,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-0.5.8_1
+libre.so re-1.1.0_2
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..3bef9dc2b47 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
  USE_DTLS_SRTP=yes USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From b6554e239505d687bc7c0375ff8205b6573090c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/462] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 1a8e90c4d6550f934fb46e0ad42ce337f19fdf2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/462] rhash: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/rhash/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ea0d6b61b1e..aedbdb898bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2932,7 +2932,7 @@ libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
-librhash.so.0 rhash-1.3.4_1
+librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..fddde4439ce 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From 2ba07cdfbe02527304e933178c3557c8fbad93a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 269/462] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From ffc070ccea06dfa1428c67ab01646956fcc74e44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 270/462] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From b3b9b5588244c9dcd12be2cce98ad398e6a9dcdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/462] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 451e5d2400f1db005f253c9f8a8b2ca1bf9ef610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 272/462] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From bfbba2ecd4f1f0c19af071d28db5e92aaf50ef86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 273/462] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 123e74d6bb906151b209a98996bcf1793090938d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/462] rtmpdump: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/rtmpdump/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aedbdb898bf..69fc52c05a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1081,7 +1081,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 6695d12b34a2130ebe7d31ad59845a40e2e794f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/462] ruby: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ruby/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 69fc52c05a8..bf59e9a46a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -435,7 +435,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.1_1
+libruby.so.2.7 ruby-2.7.2_3
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..f260af814c6 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 92320c301e4c1b774437f937eec4ac7d1c2a9c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/462] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 176b692ea0700feb1d5e1cc78ce80e1b2b83dbb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 277/462] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 6918fb2d8d583b774853b3c67207addd12bfa3b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 278/462] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 964715fe058f2287d611a5333850d07346e89132 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/462] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 7c268209218f2f9de59448c9dd46856403487f47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/462] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From 424fe0234c49e021fe19d652eb3e066b25e7b1ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/462] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From a4cb3eeb65bf7f5beddc723c1603b031f799c061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 282/462] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e9baae4b357b8f854bf8a62de24b7d310494b30c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 283/462] seafile-libclient: rebuild against OpenSSL

---
 common/shlibs                      | 2 +-
 srcpkgs/seafile-libclient/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bf59e9a46a6..5bfa9fe8223 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2526,7 +2526,7 @@ libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_2
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 9e5570042a54a9097a472f6da0f423ba43d975b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/462] serf: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/serf/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5bfa9fe8223..2862f68f10d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1414,7 +1414,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 192afd9caac0ef8542b097ebe458c6a346649891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/462] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 63bdb6f5cf5847c0ad3ef9a889ce0efee1c2c424 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 286/462] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 7977c777cd38a37dd804eb984599033d6ac46fab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 287/462] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 423fafbc690c13d6e5caa3092b2a774dec794936 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/462] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From c33326347f0954c9fd68439fbd4af12fd37da429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/462] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 3a605172ac8131706095466224cd2886dd7a6d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 290/462] spice: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/spice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2862f68f10d..c02a6ba7aa2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -783,7 +783,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From c57f00c4f9684943eec93d9679004860c60c3c47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 291/462] spice-gtk: rebuild against OpenSSL

---
 common/shlibs              | 6 +++---
 srcpkgs/spice-gtk/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c02a6ba7aa2..d60be99503b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1167,9 +1167,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 2c2d5e0972834671887fc696d58dc5343fa8a802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/462] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From e758a944a28728c11eee83e45847c3eb6aa153c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/462] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 5d11de94a53bd1cbac71c6094935eae9b65eaaba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/462] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From a6c5afa1d6dd24b60c2dae2ca1abf1078cbdec9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 295/462] sqlcipher: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/sqlcipher/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60be99503b..6003344112d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2431,7 +2431,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 5907678bbf66d45196d5928a5f905ee0dc4fa6b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 296/462] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From c189fd1f730f549c291f061327c4a357f78a4148 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/462] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 3b314d2636d88fb06e3a45abe4561633e63941ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 298/462] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From c28d47435d75ae6cd7badeb2129fc72863afbe8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 299/462] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From a632dbfbec45333879bb51926ae272d1cc6f045e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/462] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4c48113f4a39e6dcabf8743e5ac02a47af62d52d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 301/462] swi-prolog: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/swi-prolog/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6003344112d..c0f3b80bd27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2820,7 +2820,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 8042a865ab057190f94a16d7dd5603c7be122555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 302/462] swiften: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/swiften/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c0f3b80bd27..774457976aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2546,7 +2546,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 8dbcea2f14419830803105ce06f8c0f859007d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/462] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 4810a4b28c99538b5ebdd78788ef74083d5ec3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/462] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 5b8e11ab6f79ef73f810e1a6b7c5d7fc942037eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/462] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 22676cfa717f9a6fdff72ffc9291241e7e2877f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 306/462] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 96a382eabb5a9281a04f5c475a8ace02cf4fc702 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 307/462] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 6fe196285aa5781f8761cd4c92f3cab408c1ec40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/462] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 2dfb287e0084cb0f05a56c46e464a361497366d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/462] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9cc5c41ef78f3a73ea120b686391984ff14f0b9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 310/462] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 814ac5bff21c83caa9acc30763a6c2222823345b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 311/462] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 9d06a9f65611e25852358b73e36caed408679f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/462] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 607b9fd247b57b8ff49ccfecfe447786d3fcabf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/462] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 3024b5c227fac8ceeda4e747efa59e9e18a4bf33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/462] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f4beb321b2415bc2759bf57792eef96ec5f54740 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 315/462] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 54bc5325c9b2ca55d165373e02b0e96d267c72e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 316/462] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 16da0a1f891897d833c2029eca6b54104aa68cdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/462] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From f92c7395b552bd5e162282c7cb8d234381984099 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/462] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From a0a97fdfa9e914771ebd0ff8da7e7e2da5660482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 319/462] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 121e54895433eaa38ef8fd2641960a53b20b6474 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 320/462] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 8ea1f49fa67739df6a83fc6d8f8c1ec635f89ef6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 321/462] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 368615a4f813218efbcf31d313310c080c203e0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/462] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 914c36b82f1059ef1502e753be42bae58e2cad3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 323/462] trousers: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/trousers/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 774457976aa..316410afd23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2499,7 +2499,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From fbe1b4aca219c56877d2076a2e2a0a6c8e1c8aa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 324/462] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 159171a97aef83f6d55189c1f83570024ce7b3fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 325/462] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 02ba8908476d7c38ed2f0f90f1300e1abe2af6fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/462] u-boot-tools: rebuild against OpenSSL

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..afb4625abc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 93706cf56a390cea81284bc1ac55558d177ca323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/462] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From 1cc56dca23a2b1e93908f8890b33a67456eac0bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 328/462] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9c781d5b5c99cd34c5f5b88d9043df9cf5d94b94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 329/462] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From 00b037c8966ed7cc3bd91b3b20c7aa79df837d24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 330/462] unbound: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/unbound/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 316410afd23..ff81c10815f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
 libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From d851665d500c71179846263af4880617f749ad1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/462] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From aa0169e8a1967d42c4ca0b03cbc86ff5944aef03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 332/462] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a41be179d48cf7f953f8eaa4af2875b3dba8d88c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 333/462] vde2: rebuild against OpenSSL

---
 common/shlibs         | 8 ++++----
 srcpkgs/vde2/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ff81c10815f..b8215da073e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1089,10 +1089,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
 libxbps.so.5 libxbps-0.59_1
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 885d0e2a082467c91d79d50bf6f3bea0ac26ce7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 334/462] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From c56e314a995b21d9595cd547ace1ddd98ef874e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 335/462] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 05d26b36dcc51245242eaddf5e9d7a80907e009b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 336/462] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 4095ceea116e31513f6a9c2f557e88fc92e88826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 337/462] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From f19976a8c641314da5e37dfcab8d316e4a8a628c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/462] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 18041ac0c6aa5d8d2c84b4b69f469068b9a92628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/462] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 68ff9862981be7bdcd8273874143ff92f41be565 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 340/462] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From c28fb9f0b30ab98bdc863083745f02b66d04a7f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 341/462] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From a3e810fdf56a9d127dd37565e1171327c06b2f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 342/462] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 6500e868cc3b8a94fa20dc4e078fe740dfb205ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/462] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 7e487db7120cd246e005bc7478ca0976a354663e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 344/462] wvstreams: rebuild against OpenSSL

---
 common/shlibs              | 8 ++++----
 srcpkgs/wvstreams/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b8215da073e..ffb1ecbfa66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2076,10 +2076,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From 5a8f4d390876e7ead2cc4b4053dcc43cb5d818e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 345/462] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 654e772d9dac9816066781c22c03bb74cef6329c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 346/462] xar: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/xar/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffb1ecbfa66..326c7d1b95e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1096,7 +1096,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a3b43a20576d70d4c396e155f7c0dc165b9fa99e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/462] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From af9501aa9760bfe40a8564118ba103f7ba55c706 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/462] xbps: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/xbps/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 326c7d1b95e..8ea49a59d9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1086,7 +1086,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
 libminiupnpc.so.17 miniupnpc-2.1_1
-libxbps.so.5 libxbps-0.59_1
+libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
 libvdeplug.so.3 libvde2-2.3.2_23
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..16bf4155e7b 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 6f32075a9e8dff900132354cc9686c24dc6b3137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 349/462] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 849bbeb41ed3c16bd3252dec3b9a5eef5e7205b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 350/462] xmlsec1: rebuild against OpenSSL

---
 common/shlibs            | 10 +++++-----
 srcpkgs/xmlsec1/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ea49a59d9a..d8a50fbafa3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1535,9 +1535,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1726,8 +1726,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From d2c6f6bfb73ec0fcd37851739b731cb113ee1fe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 351/462] yara: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8a50fbafa3..441eb89c0fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2970,7 +2970,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From b6439fef4f2a76c39b82d2dbf751487152b7601c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/462] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 74c320f30899749362c322f987483c167b02d3c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 353/462] yubico-piv-tool: rebuild against OpenSSL

---
 common/shlibs                    | 4 ++--
 srcpkgs/yubico-piv-tool/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 441eb89c0fb..ab61f1e265a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,8 +3120,8 @@ libr_crypto.so.5.0.0 radare2-5.0.0_1
 libr_fs.so.5.0.0 radare2-5.0.0_1
 libr_magic.so.5.0.0 radare2-5.0.0_1
 libr_reg.so.5.0.0 radare2-5.0.0_1
-libykpiv.so.1 libykpiv-1.5.0_1
-libykcs11.so.1 libykcs11-1.5.0_1
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 745a9e8ae30433e5d58f44fe90199c97ebf7e130 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 354/462] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c8100d3443c79db86ee7c706daed23e0362c38c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 355/462] zchunk: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/zchunk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ab61f1e265a..9cce0be6e16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 2caf242492d102a762ef4833ce2fde60b087c572 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/462] zeek: rebuild against OpenSSL

---
 common/shlibs         | 10 +++++-----
 srcpkgs/zeek/template |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9cce0be6e16..aa6e54e9180 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3506,11 +3506,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From d7d809650d065840690e2d0cf232045d88877d18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 357/462] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From de4c0e8ca06e1791469b871b407cd2ad33798722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 358/462] NetworkManager-openconnect: rebuild against OpenSSL

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From f3dd71c60eaacea929a0fa48f1adf243d8737e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 359/462] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 2014a9b6d7fdb6911799d26008795f11e1543074 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 360/462] c-client: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/common/shlibs b/common/shlibs
index aa6e54e9180..a6ea82d1f12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2365,7 +2365,7 @@ libdwarf.so.1 libdwarf-20160613_1
 libmemcached.so.11 libmemcached-1.0.18_1
 libhashkit.so.2 libmemcached-1.0.18_1
 libmemcachedutil.so.2 libmemcached-1.0.18_1
-libc-client.so.1 c-client-2007f_1
+libc-client.so.1 c-client-2007f_4
 libonig.so.5 oniguruma-6.8.1_1
 liblo10k1.so.0 alsa-tools-1.0.29_1
 libgflags.so.2.2 gflags-2.1.2_1
diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 00000000000..a8552ff2687
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..bf65dc7277b 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 3ceb3b5cf7fe56c78fabbdfaead518a11b3fac2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 361/462] cgit: rebuild against OpenSSL

---
 srcpkgs/cgit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f7cda02da20410cf5f3f66d367d913baa330dff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 362/462] chntpw: rebuild against OpenSSL

---
 srcpkgs/chntpw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 7462dee43878dad03fc541cd6d319743ce43d3de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 363/462] choosenim: rebuild against OpenSSL

---
 srcpkgs/choosenim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..e2fb62b08d8 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From f9543e1f5665bb9a7bc070213934358ba9fc9c8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 364/462] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From a4aee4c106eab3712e3fcbad2ad7a557457f9478 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 365/462] crda: rebuild against OpenSSL

---
 srcpkgs/crda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac0602..e8082064f76 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From 8dba419cca395a43e0595586740061cf97349202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 366/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From dcab6176ab3c91236fb745bf49c80c0b20a4df78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 367/462] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 60a8423b7c3d4f46d3450d03210f6ce39b7630c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 368/462] dkms: rebuild against OpenSSL

---
 srcpkgs/dkms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From 9ec5221bab53e1e359b47b49843bb85fb4a22862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 369/462] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From b1df855988d40aa28737e53239506a3f7396c210 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 370/462] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 0239593e487c89166c2e31a656687a89b4fa1012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 371/462] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 517baed26bfb1658cb92cf8071476ca9b71b91ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 372/462] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From db179ff2e742fa263e3cd841c54da469f26e5ba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 373/462] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From f076e51a89c2301a665b5c5f88e9b526d61ff2ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 374/462] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From a725ea286ad057aa0fe091401728ac59aebeccda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 375/462] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From 5667c5ac711e15790ad70677d58a746ce2649e2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 376/462] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a292364e57f900a7149b502760a46683cbc1e130 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 377/462] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 75b13f9a8037d4511843edc626922ffc1509065c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 378/462] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 0d51dfa003d8a0dbe446534664c12f941108ca96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 379/462] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 53240cf6a78fd5bc1af426b5acd6c534a6c72854 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 380/462] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From 06ec3f98c22cc6bf216c24d36da7b301731b90c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 381/462] libvncserver: rebuild against OpenSSL

---
 common/shlibs                 | 4 ++--
 srcpkgs/libvncserver/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6ea82d1f12..0476aee0fa5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1381,8 +1381,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From e6cbb2dfc3af333421f7c6e6bfcba601ff54fdc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 382/462] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From d1f1446dd3f3e297834904dc700254e4c8f6cfc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 383/462] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 413beb36d1cb810ac1856a4e3b0e7b4f227d04e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 384/462] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From fb7a53316c63929a01fd3acc1a92d36a074c0f9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 385/462] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index 0476aee0fa5..d8abe9689f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -579,7 +579,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From e518688fef5c6dca3318884ba593f425bde3b6f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 386/462] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 93777b3ac2cb638efbadc6953416d5ea36752b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 387/462] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 95376a50c7568029eb6c7607ca232426d6b3b278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 388/462] nim: rebuild against OpenSSL

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From accf93278a4e29935aa47bafa0433e0cbc43dc53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 389/462] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From 8ac9eea9edf01be2ca6efb66dc1aeb9f198cefea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 390/462] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 277d0c42c25f96b5c7b9fd1b0a535a3635d9e5e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 391/462] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From c17465f38b11389d4a41cb15ba9bd67d1767f882 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 392/462] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 555644ed01f9fdbeac2da845c3558f6c7b8b9397 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 393/462] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 04249a084b736ab0af3e82bb9c8bd0009c54aa86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 394/462] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 13f3f0fece306baecd3b862e78a80aaa3381df9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 395/462] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From 153d83ccb5bdd73d46066df5a6c42d10cd6f4569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 396/462] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 28ce96e9794d266b683f75ff60fdd5e48236d718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 397/462] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From ee7acff33dfe1e89192980de21c96f27da5ac4f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 398/462] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 0d0c0e66604..dfdf391d0ae 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From bf03d9c721f011b555ada4f34cb41efbe7dd408b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 399/462] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index b201e6b993c..73631552a9b 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From ac1bda685ccc9d07fa406adcf490a2e8770da623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 400/462] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 01632f5dd0a33b824c9e40d68bdb94b4174f87b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 401/462] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6e47308571434f9edcdeb911ee8ee86f26dbfba3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 402/462] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 360b7f701cf31e29a8e1e2bd7f8b7847786738b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 403/462] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From aafa08c43d5da7f4c4af3b395df268ed06969c5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 404/462] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 9a2cad9dfd886528494e684509588b7b0fdab04f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 405/462] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 94e6ec447dd0a9a897d6a5948f4ab3e373fdec6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 406/462] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 68014a2d440401edaedb233f34c33058c5a86878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 407/462] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 831a4bc2242d11f6c2b97b90650ff6a083a0daa7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 408/462] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From d87ba61e7051dc956f3ea474fb82e48e564373b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 409/462] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From f521dc241f241b28ea978113c9f20af9883afeb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 410/462] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From e833553a94731126ff552e6f2bdff975346217a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 411/462] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From cc4786f9d86447b247c0481c262f0f1608df22e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 412/462] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 96c08f45eb1ce4f177588e225440466168964931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 413/462] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From 5ac4843efeed18356e9268cee2a1697e42cffd8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 414/462] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From b3014ce411bee0f9ba2b6a34bfcd827741bef3fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 415/462] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,15 +1,15 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+hostmakedepends="pkg-config yasm protobuf"
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 5823d7b0a55d6aac3fd074932dd9a57f856e113f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 416/462] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b67bf4bc2625326b777c85de8e0656601a58ea0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 417/462] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From c67b6321797dd314a476a833824b95e471951b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 418/462] xen: change to OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From c16647ee18205b8b68e212580167f899982732a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 419/462] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 8f5384cc1faa5e81ac635c17cc0879feeb8c8eb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 420/462] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From b389bca13fe69bdd02bf9a69747bb99224063fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 421/462] boinc: rebuild against OpenSSL

---
 common/shlibs          | 12 ++++++------
 srcpkgs/boinc/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d8abe9689f6..c70bb21a258 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2420,12 +2420,12 @@ libcsound64.so.6.0 csound-6.05.0_1
 libcsnd6.so.6.0 csound-6.05.0_1
 libfko.so.3 libfko-2.6.9_1
 libvterm.so.0 libvterm-0.0.20151005_1
-libboinc_opencl.so.7 boinc-7.6.2_1
-libboinc_api.so.7 boinc-7.6.2_1
-libboinc_graphics2.so.7 boinc-7.6.2_1
-libboinc_opencl.so.7 boinc-nox-7.6.2_1
-libboinc_api.so.7 boinc-nox-7.6.2_1
-libboinc_graphics2.so.7 boinc-nox-7.6.2_1
+libboinc_opencl.so.7 boinc-7.16.16_2
+libboinc_api.so.7 boinc-7.16.16_2
+libboinc_graphics2.so.7 boinc-7.16.16_2
+libboinc_opencl.so.7 boinc-nox-7.16.16_2
+libboinc_api.so.7 boinc-nox-7.16.16_2
+libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f85921..d3fde8b73b6 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 48d034a4be0d8d6a0ecb6d8925069ef4fd7297e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 422/462] calibre: rebuild against OpenSSL

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69..166f5d9c9ec 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 9125bbab67d551d17719d38cd94ff984f26a6fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 423/462] clamav: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/clamav/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c70bb21a258..e077692a149 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2171,10 +2171,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.101.0_1
-libclamunrar.so.9 clamav-0.101.0_1
-libclamunrar_iface.so.9 clamav-0.101.0_1
-libfreshclam.so.2 clamav-0.102.0_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c28..e65ed2c9ed8 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From a9ea89f7aae68b0d8f8a3c9ce26a528979dc1dbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 424/462] git: rebuild against OpenSSL

---
 srcpkgs/git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6a..b24e3e48395 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From e80f1084ae61b05df02f0966adebf5ebff561353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 425/462] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 6e64e96a7cc152073e7c158367694b2f739342f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 426/462] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From e370b2a3588a6f852952b40a334ed29cc197993f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 427/462] libgdal: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgdal/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e077692a149..234646579ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2433,7 +2433,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From a6057791c98e54b2ad35562643ba9a8e2269e61a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 428/462] lxc: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/lxc/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 234646579ef..6f07ec34677 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1539,7 +1539,7 @@ libxmlsec1.so.1 xmlsec1-1.2.31_2
 libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
 libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From 573a695057973e2994251a61c21caa7b5f0ab100 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 429/462] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From bb124730a4ae43edcb4287f05b6581bc2d001ce9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 430/462] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From b45be45aa16bef6d70f4339fd730338c8fcbaca7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 431/462] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 20041e2648e7ba66b7976be8b6dcf1ae8120bbef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 432/462] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 6458f83519f6065970192795116df265cd4e3d22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 433/462] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 64b6035e3c2fb04a504773bb2509cd21cdd14973 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 434/462] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From a48a5d54b627c79ff89169389235bfdddc814d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 435/462] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 87d87a8b061c7d8837ba86bd92e767c3b90f13c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 436/462] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 43b9d49ea861b85d16f8c5fe561370bcfd9a9521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 437/462] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 5c3017896b2830e989530407385acefb6f6897ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 438/462] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 6cdff6d960310d63007b49683b9e83042d6e6ff2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 439/462] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 0adf1edffde1f9f8735941e04849b025e371609a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 440/462] sssd: rebuild against OpenSSL

---
 common/shlibs         | 18 +++++++++---------
 srcpkgs/sssd/template |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6f07ec34677..c2e8e4eaec1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2686,15 +2686,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 47b2840ce65b7a618968a8241502ab0f09eb4441 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 441/462] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From ca062f34f58cca6b33d1965d19b5e9033dfea220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 442/462] xmlrpc-c: rebuild against OpenSSL

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/xmlrpc-c/template |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2e8e4eaec1..dfbbd9cba30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1738,22 +1738,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 6e4437869149052ef63809122a441b28b3baed10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 443/462] zfs: rebuild against OpenSSL

---
 common/shlibs        | 12 ++++++------
 srcpkgs/zfs/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dfbbd9cba30..f1f80201e6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3789,12 +3789,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From f0380902fd1b5eba4ad1a9587ed7f68f65758d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 444/462] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e0f1c35ac0f2d10e7f43e394c8ba0f81587b1de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 445/462] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 09fe38bb3e8078b5c8ed4f69267731e39e1e09ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 446/462] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From d65907f00d36b954edc754db95ce964d586cb017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 447/462] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 4b29aa200227375ca5da4cd174393742da78a015 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 448/462] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From a858ec1ffb85818c62ac8f10e4ed3d6f75a6b105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 449/462] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 8b1fdc07ddd49efe2a1b13adb3b97c26187d1a21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 450/462] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From a4ed3ba4b62b4ec692c9d310e62fe47ec042f62f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 451/462] acme-client: remove package

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a8a42aa0a3..ed7e812aab8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 275ba9ca89e3e977161c69490dac34800b9a76e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 452/462] Ice: rebuild against OpenSSL

---
 common/shlibs        | 32 ++++++++++++++++----------------
 srcpkgs/Ice/template |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f1f80201e6d..b24e4c54a6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,22 +961,22 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.8 kdecoration-5.21.0_1
-libGlacier2.so.37 libIce-3.7.5_1
-libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
-libIce.so.37 libIce-3.7.5_1
-libIceSSL.so.37 libIce-3.7.5_1
-libIceUtil.so.37 libIce-3.7.5_1
-libIceStormService.so.37 libIce-3.7.5_1
-libIceStorm.so.37 libIce-3.7.5_1
-libFreeze.so.37 libIce-3.7.5_1
-libSlice.so.37 libIce-3.7.5_1
-libIceBox.so.37 libIce-3.7.5_1
-libIceGrid.so.37 libIce-3.7.5_1
-libIcePatch2.so.37 libIce-3.7.5_1
-libIceDB.so.37 libIce-3.7.5_1
-libIceXML.so.37 libIce-3.7.5_1
-libIceDiscovery.so.37 libIce-3.7.5_1
-libIceLocatorDiscovery.so.37 libIce-3.7.5_1
+libGlacier2.so.37 libIce-3.7.5_2
+libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2
+libIce.so.37 libIce-3.7.5_2
+libIceSSL.so.37 libIce-3.7.5_2
+libIceUtil.so.37 libIce-3.7.5_2
+libIceStormService.so.37 libIce-3.7.5_2
+libIceStorm.so.37 libIce-3.7.5_2
+libFreeze.so.37 libIce-3.7.5_2
+libSlice.so.37 libIce-3.7.5_2
+libIceBox.so.37 libIce-3.7.5_2
+libIceGrid.so.37 libIce-3.7.5_2
+libIcePatch2.so.37 libIce-3.7.5_2
+libIceDB.so.37 libIce-3.7.5_2
+libIceXML.so.37 libIce-3.7.5_2
+libIceDiscovery.so.37 libIce-3.7.5_2
+libIceLocatorDiscovery.so.37 libIce-3.7.5_2
 libkdecorations2private.so.8 kdecoration-5.20.90_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd5639..6c3e6971874 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From b5711a3aef84d1ae87070c8a39bf350be97703dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 453/462] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 731d878e92f2012f380419d64cf1967fa81f67a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 454/462] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From a847c690c33f1f940bfc0e9820f660f4d5af7b70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 455/462] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7722ed72e89697e548a289dcdcbca41fd5539047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 456/462] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 9bb5f0d9110421e7ac0ab47aeec95c54dda5557b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 457/462] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 47b2f643dff7c81accae7c94a5678935bc78c253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 458/462] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From 01874afb03417166bc0b65cb65bff3c15a4742eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 459/462] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc..fbf723826ac 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.178
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 92c7ff36fa2e698e7046d5892e041f9c53604bbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 460/462] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 205605d4507caa877ee768ce86e034ae14349073 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 461/462] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d..8944092048b 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.102
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 794e6ad97a5cf61c71e2f0604df3930b628ad48d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 462/462] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 0c01d11ba9e..1b513406214 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.3
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -25,7 +25,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

Re: [PR PATCH] [Updated] New package: openssl-1.1.1j

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056

New package: openssl-1.1.1j
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187

A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 483034 bytes --]

From fff702bc514f12a7a302b133dc68ea0be409ce26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/358] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From bf9955cba8c7756ea9a01f88197da70126abe564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 002/358] libressl: remove package

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0ccaeb5c872..30c8631ebb1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1789,6 +1789,7 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-devel-1.4_1
+libtls.so.17 libtls17-2.7.2_1
 libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
 libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6

From 1a491131646863666dba7474e4f6b8b099fdfc06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 003/358] dpdk: rebuild against OpenSSL

---
 common/shlibs         | 268 +++++++++++++++++++++---------------------
 srcpkgs/dpdk/template |   6 +-
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 30c8631ebb1..9592aab4466 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3659,140 +3659,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From d079823211624c6c43769c5e179d3479b20508b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 004/358] ecryptfs-utils: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/common/shlibs b/common/shlibs
index 9592aab4466..43347238c4e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1116,7 +1116,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
 libvdehist.so.0 libvde2-2.3.2_1
 libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From 9bfa77057453b6b22de25a07e7a4fa46daef2c31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 005/358] efitools: rebuild against OpenSSL

---
 srcpkgs/efitools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 96f2369c54fb1177172d39430e3077027eb32cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 006/358] efl: rebuild against OpenSSL

---
 common/shlibs        | 78 ++++++++++++++++++++++----------------------
 srcpkgs/efl/template |  4 +--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 43347238c4e..16c5fcb9f6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1482,42 +1482,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1884,9 +1884,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 3f96cd788515931103dfd3ba325482e8a331c238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 007/358] eggdrop: rebuild against OpenSSL

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From d452778560082051dd2fe638586c49ec840a4ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 008/358] eid-mw: rebuild against OpenSSL

---
 srcpkgs/eid-mw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From d0e78dd33f0129d16c0483ea9314d311583ec8d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 009/358] eiskaltdcpp-qt: rebuild against OpenSSL

---
 srcpkgs/eiskaltdcpp-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
 hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
  miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
 short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"

From f22f5a32004970f38a418afc777c93078b966892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 010/358] ejabberd: rebuild against OpenSSL

---
 srcpkgs/ejabberd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From 357d34dc236b3b908af57fd46a75c389613e46f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 011/358] elinks: rebuild against OpenSSL

---
 srcpkgs/elinks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 27442ec8f58e0f228f682dfa55a3f415f89a84c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 012/358] elog: rebuild against OpenSSL

---
 srcpkgs/elog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From b5f4a0352e69d9458115b1986578721b38d9df0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 013/358] encfs: rebuild against OpenSSL

---
 srcpkgs/encfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 887e0eb66d13040aa7c7e6388f9d16cbeb297df4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 014/358] erlang: rebuild against OpenSSL

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From cee224d1571c30a7d7125164e7b5e9cb3d389d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 015/358] ettercap: rebuild against OpenSSL

---
 srcpkgs/ettercap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From a0f8ee790edff62b095aa628d6635a13edfc9d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 016/358] facter: rebuild against OpenSSL

---
 srcpkgs/facter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From 5c25442d1131ffbe1443237e48b5d234e3babd0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 017/358] falkon: rebuild against OpenSSL

---
 srcpkgs/falkon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From c45f38cedb00daf6e858516dbe606d9d9c620fe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 018/358] fdm: rebuild against OpenSSL

---
 srcpkgs/fdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From d724793d622ea0d5b37999dea755c0ec58f6b7e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 019/358] fetchmail: rebuild against OpenSSL

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From 529b3b26a4fd15f6a291b9cbc8e155a2999a1b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 020/358] ffsend: rebuild against OpenSSL

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ae1df115fa15cb8114575d38d0362188477c37a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 021/358] fossil: rebuild against OpenSSL

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ed5662157b0295408246758c6932b2fac77a0ef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 022/358] fractal: rebuild against OpenSSL

---
 srcpkgs/fractal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 81019b198f834f5a517164a2e7156aad4ee03b2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 023/358] freerdp: rebuild against OpenSSL

---
 common/shlibs            | 26 +++++++++++++-------------
 srcpkgs/freerdp/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 16c5fcb9f6a..5f2589cf8b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1624,19 +1624,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
 libcppunit-1.14.so.0 libcppunit-1.14.0_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From eb870dc18399d9cc27ed44d6b9a4b8328b28840c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 024/358] freshplayerplugin: rebuild against OpenSSL

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 8d7f93c8617805e605781ef95fe628123192379a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 025/358] gambit: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/gambit/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f2589cf8b4..63007692ab4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3640,7 +3640,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 67f10e187518ee5d47d9e8d2ce82a2defa1db52f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 026/358] gatling: rebuild against OpenSSL

---
 srcpkgs/gatling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 12f4e72b860a4581fc4130c2dead0bff7673d8e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 027/358] gcsf: rebuild against OpenSSL

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From a99e02ad5cc5ef26a4112d29db09b5952bdffc9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 028/358] gemserv: rebuild against OpenSSL

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From ca00985adb0b659b7fdcd0834e49662a4ec046ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 029/358] gerbil: rebuild against OpenSSL

---
 srcpkgs/gerbil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From 1fc0e55c49fe133b61a571cc114a7c1773e5b0e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 030/358] getdns: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/getdns/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 63007692ab4..65e582d61d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,10 +3511,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 3cd4f243a9507ac4ba618b15631d49135a33ed21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 031/358] gftp: rebuild against OpenSSL

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From ce5997bd81f92fd47dd86d7a939664798d1be573 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 032/358] git-brws: rebuild against OpenSSL

---
 srcpkgs/git-brws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 48001a45619839a0b22dbf388302c64a5f0a3913 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 033/358] git-crypt: rebuild against OpenSSL

---
 srcpkgs/git-crypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 01ae910021c4a48b8b06966941500fb92fd546fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 034/358] gkrellm: rebuild against OpenSSL

---
 srcpkgs/gkrellm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From 1f0f779db151714b62e743245591c1d3da30871e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 035/358] glusterfs: rebuild against OpenSSL

---
 common/shlibs              | 14 +++++++-------
 srcpkgs/glusterfs/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 65e582d61d7..09623ac45c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1462,13 +1462,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 66520900fea1cd42a0e07191b4c248ccfcba4717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 036/358] gnome-podcasts: rebuild against OpenSSL

---
 srcpkgs/gnome-podcasts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 29599e8ac04c0bde8d1019019b83be348c567073 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 037/358] gogglesmm: rebuild against OpenSSL

---
 srcpkgs/gogglesmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From bad6bf7411ca73f563f1897ccf4eed9ac34f6c38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 038/358] grpc: rebuild against OpenSSL

---
 common/shlibs         | 24 ++++++++++++------------
 srcpkgs/grpc/template |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 09623ac45c6..cbdb207d7cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3601,18 +3601,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..708cd5b6518 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=2
+revision=3
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 88755b3ba09da5f502eb30a1dd2f3c0d28dad486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 039/358] grub-customizer: rebuild against OpenSSL

---
 srcpkgs/grub-customizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From 5006689497d1eceb523630370c16c85aa442e95a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 040/358] gsoap: rebuild against OpenSSL

---
 srcpkgs/gsoap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 84f4ade3d6c793342a19125836e781a6bd466d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 041/358] gst-plugins-bad1: rebuild against OpenSSL

---
 common/shlibs                     | 12 ++++++------
 srcpkgs/gst-plugins-bad1/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cbdb207d7cf..7d8641b6a05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,12 +1155,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From bf8fcd61642033bb51c18081dd87343b49dfa98a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 042/358] gwenhywfar: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/gwenhywfar/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7d8641b6a05..a813883aa00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1546,11 +1546,11 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1
 libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From 131a7641c4a07e24c967d6793a05c113804c5892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 043/358] h2o: rebuild against OpenSSL

---
 srcpkgs/h2o/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7d2d449c7202688cc66ec334f3c7f39846402eb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 044/358] haproxy: rebuild against OpenSSL

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 6769159248fa3f2d2a96cd58f1fd66070847731a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 045/358] hexchat: rebuild against OpenSSL

---
 srcpkgs/hexchat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
  libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"

From 88119bab7e379b27763801a680f014262d71fdc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 046/358] hfsprogs: rebuild against OpenSSL

---
 srcpkgs/hfsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From b7923f3efbccd5aabe3e9e4d1ca099c5468b6b15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 047/358] hitch: rebuild against OpenSSL

---
 srcpkgs/hitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From 123e1d247f473677f017f2787042b6d9152e1420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 048/358] hostapd: rebuild against OpenSSL

---
 srcpkgs/hostapd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 8deee564e9a9eeea071b002fe92556a72427a4c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 049/358] hplip: rebuild against OpenSSL

---
 srcpkgs/hplip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 864d849796854df447e4da2a1d19212cf02de264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 050/358] httpdirfs: rebuild against OpenSSL

---
 srcpkgs/httpdirfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From ae1c968c6a39accbe41dbe677a649175516d65d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 051/358] httrack: rebuild against OpenSSL

---
 common/shlibs            | 4 ++--
 srcpkgs/httrack/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a813883aa00..3af0ecf79ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,8 +2176,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From becf3565c903d52833fa20ffc181d0d5599063f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 052/358] i2pd: rebuild against OpenSSL

---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 95d74db2362c8a2ee4201825da6569f36f92f637 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 053/358] icecast: rebuild against OpenSSL

---
 srcpkgs/icecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6e8e1238007c97475fd98fa6928b9d5bbb7128c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 054/358] icinga2: rebuild against OpenSSL

---
 srcpkgs/icinga2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
  -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
  -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
 hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 0a633f6401999eb3182fe1d1a9854683e12c2e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 055/358] imapfilter: rebuild against OpenSSL

---
 srcpkgs/imapfilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 02ef77e3c69491e5e73ebe381e4ed6009b60c5e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 056/358] inadyn: rebuild against OpenSSL

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 35ee407b2b1febf0bfb91ea1cdc848c03fc6882d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 057/358] inspircd: rebuild against OpenSSL

---
 srcpkgs/inspircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From 365fa788a8ab1f1bc0934c8e886a5959d342420c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 058/358] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 3814b27afbb3cfbf0f703b9d9fb6631a44ad75dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 059/358] ipmiutil: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/ipmiutil/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3af0ecf79ea..9482462f94d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2604,7 +2604,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 096418c2de737556c3550f6b98ba6887c06851c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 060/358] iputils: rebuild against OpenSSL

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7e85c7bad8c0879eba9c951b25cb87f87a97637e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 061/358] irssi: rebuild against OpenSSL

---
 srcpkgs/irssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 78fda6008a3f47af8be2100ec215ae1d6f708d98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 062/358] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 54694f596c65d1111350099410cee9250666adaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 063/358] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From c3090f8fe71243a937956252cdeca174f6de7c99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 064/358] kea: change botan build-option to use OpenSSL

---
 common/shlibs        | 40 ++++++++++++++++++++--------------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9482462f94d..9f1bd0d9cff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2860,26 +2860,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
 libkj-async-0.8.0.so capnproto-0.8.0_1
 libkj-test-0.8.0.so capnproto-0.8.0_1
 libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_1
-libkea-http.so.23 libkea-1.9.4_1
-libkea-log.so.18 libkea-1.9.4_1
-libkea-pgsql.so.18 libkea-1.9.4_1
-libkea-process.so.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 hostmakedepends="flex bison perl pkg-config automake libtool
  doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From e1626dfef0bf32a3170fe3de1d8dac0f6fd1179a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 065/358] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1d40399dcb54ce0df58dc3b859b434e934ada3ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 066/358] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From ff19b101f090442638d5059fdc1c988f7be848de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 067/358] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 9bc7fe23f9ec98cf5e4eee953442d8bcd612939b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 068/358] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From 961274afbf0de37bd37c89fe8b2303d301eb9b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 069/358] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 4f39724bbed33bbdb8d9d5df799842b08813f552 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 070/358] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From 42d544500150c4cabdaf6aed29d98023797af895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 071/358] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c193baedd384f32502aeed31a5d68cefc1343684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 072/358] ldns: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ldns/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9f1bd0d9cff..ca6b8f815b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2029,7 +2029,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From d4dbdc1afc4ed3ee973460ae7befcde963de4fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 073/358] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ed12dd89824d0191f1a796295e967a89bad723a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 074/358] libetpan: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libetpan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ca6b8f815b4..06a32037044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2168,7 +2168,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From f9d08b21e66e972922b72b7152caf14c1ea411fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 075/358] libfetch: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfetch/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 06a32037044..cf926291e21 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -775,7 +775,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2f8affb992831f5795dbd07792570b14125c3550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 076/358] libfido2: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfido2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cf926291e21..eec8b8711c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3832,7 +3832,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From fe53d23c1ad8a9580c0002aab997413d8b72201d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 077/358] libgda: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/libgda/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eec8b8711c1..96446153215 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1417,10 +1417,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From f442e00945f0958dfb2371c956d133ec3ff7b7c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 078/358] libimobiledevice: rebuild against OpenSSL

---
 common/shlibs                     | 2 +-
 srcpkgs/libimobiledevice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 96446153215..8e8e46c40c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,7 +2026,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6576cd0b9e1669760e02dc140ae2de1d9b907527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 079/358] libircclient: rebuild against OpenSSL

---
 common/shlibs                 | 2 +-
 srcpkgs/libircclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8e8e46c40c2..efb783d4194 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 10d6a44cbd99addbea415170e5ae0ad4ea98fd33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 080/358] libknet1: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/libknet1/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index efb783d4194..57f1557debc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3646,11 +3646,11 @@ libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
 libqb.so.100 libqb-2.0.0_1
 libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From 2f4fb59f1549c9c8f246063739d48b1f443d3fa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 081/358] libmowgli: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libmowgli/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 57f1557debc..9a89f234881 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,7 +1132,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d119117424b6b038bf535b96b2ec5c596236ab09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 082/358] libnice: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libnice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9a89f234881..49ae6ae0cac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -823,7 +823,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 2fc72054936aee5661655eb2de2c5c7c8c8b47dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 083/358] libostree: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libostree/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 49ae6ae0cac..747cf27aaf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2948,7 +2948,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.4.1_2
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From e7b3a805c8871e546ad6e4fc29c0ea4d65797030 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 084/358] librdkafka: rebuild against OpenSSL

---
 common/shlibs               | 4 ++--
 srcpkgs/librdkafka/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 747cf27aaf1..2f450e7e32f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3817,8 +3817,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From 2c1398391e1ea563585596d6bac2b08bce1cc0d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 085/358] libssh: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libssh/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2f450e7e32f..0ade45d8c1d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1388,7 +1388,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 libsolarus.so.1 solarus-1.6.2_1
 libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7fd83e907cd2f8435b99e1f01ee5295d402268f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 086/358] libstrophe: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libstrophe/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ade45d8c1d..cc4cd5da5d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1819,7 +1819,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From a90da928cf28d2d5bddb5c6917fcec5a85f52897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 087/358] libtd: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cc4cd5da5d6..d790a9906a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3881,7 +3881,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 44f66540c27ad7db90c268eceae4c872dd469f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 088/358] libtorrent: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libtorrent/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d790a9906a1..90954f1be63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -841,7 +841,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
 checkdepends="libcppunit-devel"
 short_desc="BitTorrent library written in C++"

From 4b1d8e5345d51170bc600ebe1b3031e5ac0ee642 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 089/358] libtorrent-rasterbar: rebuild against OpenSSL

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 90954f1be63..c1918413af2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2033,7 +2033,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From 149ee257df28b24fd9ab9fbcce0ce4d6729cf9b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 090/358] libu2f-host: rebuild against OpenSSL

---
 common/shlibs                | 2 +-
 srcpkgs/libu2f-host/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c1918413af2..ae5713e2cf2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2448,7 +2448,7 @@ libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f5f41631f12d96fab334b3e18e4e15e59011a745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 091/358] libu2f-server: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libu2f-server/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ae5713e2cf2..3ce1b86d4c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2449,7 +2449,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From c9e511317bb80e5089f9e65ca2f87e5ad087a9e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 092/358] libucl: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/common/shlibs b/common/shlibs
index 3ce1b86d4c9..dc0c8ec175d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1869,7 +1869,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From cb3edaa11dbfe1e59bfb239a837ab3ab1a3a6abb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 093/358] libwebsockets: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libwebsockets/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dc0c8ec175d..e82af057151 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2191,7 +2191,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From 66bef29b9692732752bc9940c0cb4f56107779d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 094/358] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From b3050dfdf768107bdacdd20c4df5ffd4d6d9a8fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 095/358] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7d2ebac551aea5bac38b5ceb09a26d51f7c77be5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 096/358] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From c6e0cd1f81e4e7b5575f2c15a1ab50e2d8ac0f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 097/358] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6a2e4e4183b5bd6a52151ee3f2de2e6ffb54d1df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 098/358] live555: rebuild against OpenSSL

---
 common/shlibs            | 8 ++++----
 srcpkgs/live555/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e82af057151..d3575935f9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2994,10 +2994,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 0c08a900df1d9ce367a6107c5b93827d14817aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 099/358] loudmouth: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/loudmouth/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3575935f9a..0dd14caba3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2032,7 +2032,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
 hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d254f4e945be195b35706f5786444ef77d8afd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 100/358] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From da196bf17ffd868a66aa7987c1576bbbdd99cb7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 101/358] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 3e59f1192a2ce54573ae6638663b12771b05843b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 102/358] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From d10f2a083a717f967d8193247656dc098c1e764b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 103/358] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 27ff200b76ce914bfa647b9b7d472aa85da8219a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 104/358] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 39d82e78f03e6a3e4a0b8e29e716847f381a33c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 105/358] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From b7e448e3cd0027c607de259dd4ba15057398b1da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 106/358] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From 9b2d5415f870965e781bf7c59a0279bd45ad36b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 107/358] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From cca3da356113369ce9eae6a83a88b0b89abd6f77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 108/358] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From 2ae5b782736eedf3fcd723a990b04026d2216c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 109/358] mongo-c-driver: rebuild against OpenSSL

---
 common/shlibs                   | 2 +-
 srcpkgs/mongo-c-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0dd14caba3f..2d9cbd05b36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3887,7 +3887,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 liburing.so.1 liburing-0.7_1
-libbson-1.0.so.0 libbson-1.17.0_1
+libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 6d8a313c27a83d8c6a4915b01c04ef7f424cf636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 110/358] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d268b3c0f0050108f60f329f789e1cb76f4ae510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 111/358] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 9d14d6935c4784db972e8ced607e8449d22361c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 112/358] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From cd644e4ebb76d476d0400ed5d21ab31d3ec220a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 113/358] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 7a95cfb2ad9f5c8f236d42a1751e73e574f6e113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 114/358] mosquitto: rebuild against OpenSSL

---
 common/shlibs              | 4 ++--
 srcpkgs/mosquitto/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d9cbd05b36..6874350335e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2145,8 +2145,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.1 mpv-0.8.0_2
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From 8b4450a141947e0be54526ae9dcc41b4e675a6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 115/358] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 45b9f3830614c1ae7ba88bd2dc03e8b2e2c0fc97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 116/358] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 065ca56b4be46faf0caa70ab737ef0a90e1129b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 117/358] mtxclient: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6874350335e..c6d7fe39c5f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From baa89c3c1d209e891d00013ff24d51489c922e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 118/358] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From 338d4e16fef9616b5a3821206f86d1d3b2765ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 119/358] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 22d5ee3db8d14ed78eeeaedc5ae86516dabf73ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 120/358] munge: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/munge/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c6d7fe39c5f..dca29474b45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2525,7 +2525,7 @@ libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
 libaudiofile.so.1 audiofile-0.3.6_1
 libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.8 libmgba-0.8.1_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 7d66a2369ec8b161fd890bb742a64ae2443999bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 121/358] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From f855b57ce7ceb29af5373f81ca3b92d0d2c1f4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 122/358] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From fc213ac6758f7597ccd53450514f42d918f78317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 123/358] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From 0e4985350dccf840c51c6b957e76e92564c39991 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 124/358] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From 9913dc3fe5b60375c68ba94ffc5885af12ef7348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 125/358] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 8ee4f6a76936e8d889a717a12c3e689c3515fb53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 126/358] neon: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/neon/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dca29474b45..341e3b1908a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -776,7 +776,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f52631c765895016ecbaa059ef879d503e39fc25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 127/358] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 88d81dfacad8f2b1fc3766e0c62178b1d2f4412d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 128/358] netpgp: rebuild against OpenSSL

---
 common/shlibs                                 |   4 +-
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 4 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/common/shlibs b/common/shlibs
index 341e3b1908a..aa083a5c7ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -710,8 +710,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
 libmca_common_dstore.so.1 libopenmpi-4.0.1_1
 libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 7192bd064b9acc05faca0ebb5c4f29827dcd1d01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 129/358] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From b0f2c7a35dfa4e3b2a96a3b6a1ed570d093eddda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 130/358] network-ups-tools: rebuild against OpenSSL

---
 common/shlibs                                 |   6 +-
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/common/shlibs b/common/shlibs
index aa083a5c7ff..b9ead4f1761 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1685,9 +1685,9 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
-libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
-libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
 libsphinxad.so.0 sphinxbase-0.8_1
 libsphinxbase.so.1 sphinxbase-0.8_1
 libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From 8f50a446bcf4bd51a948b0798f074bc00f9e326b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 131/358] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From 283c1142341bf389e32d2fb481d8be30e02d6b15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 132/358] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7202916915ae396165aa0cc7b2f358ff5c53698c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 133/358] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9b18b075384396d8b0d2c2823c5279771501c737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 134/358] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From f80f5d13396e27ff6a923130e8a74b80fc3b4938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 135/358] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From ee66e4aff9838a6574d6759d952e99c4a212241c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 136/358] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 0652814fee334feca4e4bf251b42e7d3421ef06f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 137/358] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From 045dee5ab33067f14a1b838005920ce9bea9128a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 138/358] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From 885d8e9a4724d7c7c73825653b6bc8b136675e62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 139/358] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 4122218a15ba3af2176f4de6b2dbaa163fc4b1fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 140/358] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 6419fe79147b89ba5d1898bd061d39c031cd49f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 141/358] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 98916c823e08ce87e5d3c17a39bb319bccf38d9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 142/358] open-isns: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/open-isns/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b9ead4f1761..431ee310fc3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2819,7 +2819,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
 libKF5KrossCore.so.5 kross-5.26.0_1
 libKF5KrossUi.so.5 kross-5.36.0_1
 liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 3b1f0fca8c00367181c1e7b626387b1af5f0ac8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 143/358] opendkim: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 3 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/common/shlibs b/common/shlibs
index 431ee310fc3..a6efeeaac91 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2693,7 +2693,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 7a93d5886f6a34d29a6935fb5fc858b08b871f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 144/358] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From 0d4f770eef1ff182a701855dcbd766bfa44944f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 145/358] opensc: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6efeeaac91..7729deb2cef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1742,7 +1742,7 @@ libLinearMath.so.2.89 bullet-2.89_1
 libBulletSoftBody.so.2.89 bullet-2.89_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 09b2669dce1124c9439c09bdcb56d401299fb6f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 146/358] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 68368befa39a269a3be7091c15aa9e62fef9044f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 147/358] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From 2bf1a48a374393d68be1ea61883d5f60502f8293 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 148/358] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From f05f32e2bb568411b80d371b23adf8ed2bedcfb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 149/358] opkg: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/opkg/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7729deb2cef..88eaeb938e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3539,7 +3539,7 @@ libvkd3d.so.1 vkd3d-1.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From 7924ea6fd5d87ef261b0fa9a8738e2425f4c634b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 150/358] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From cff35210a9f29866ff8969e346f4dfde677aae4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 151/358] opusfile: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/opusfile/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 88eaeb938e4..5aba12346e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1223,8 +1223,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a09600037902dfe2a3c7b0d754ce02cd1e893de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 152/358] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 8dbcca8c0baae90ca6a8eff7b4378e0bae5ab2af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 153/358] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 71c06e8ef47b9fd47829e4965429a6afa4f68081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 154/358] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From daef5a83c9fc819567f91d84d82deb09e0c6e136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 155/358] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From 4ffeed94a8a5ec871671423a8a40210587a4d1ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 156/358] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 32f36989b267f49870869301f948bf63fdcb7db9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 157/358] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5c6044124474207bc2262d16b3ffc5a00d67be44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 158/358] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2ce2fad2927a7334e277f8c9080e83971bbe2b8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 159/358] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From 8bb5269852363b5fc28375b6d50e74ae022e4734 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 160/358] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From 6e3ac395b89f5d541b1537236fba5ccdfcaed3e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 161/358] perl-DBD-mysql: rebuild against OpenSSL

---
 srcpkgs/perl-DBD-mysql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From 6615a5108b80feef56989ce4026c393a1c51da35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 162/358] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 9dbf8ed9ab2cdf66ddb4fdd8d425d796c68cd957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 163/358] perl-Net-SSLeay: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From a0cc2d71ef28a9dd96009bcc326134932d3da5de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 164/358] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From 8a8684dc0b20f443d159785d9ee9bf53d8e66242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 165/358] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From d5b0795cc74448e2a785efeeabfdc2fd231185f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 166/358] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From 4a05ed6f653888c5baec3d49cb3788c8f6beaa6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 167/358] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From 098f71d3bf358b1029ad2a86ca2775897d5b810c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 168/358] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From 5aea2be11af00452adeb0876970e8564aa07ed0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 169/358] pjproject: rebuild against OpenSSL

---
 common/shlibs              | 28 ++++++++++++++--------------
 srcpkgs/pjproject/template |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5aba12346e4..fc5cf2ade7c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2494,20 +2494,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 7e467925d3df3834429a6f29abdc1743d3f55ca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 170/358] pkcs11-helper: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/pkcs11-helper/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5cf2ade7c..7e215d8141d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3116,7 +3116,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
 libkdeconnectcore.so.20 kdeconnect-20.12.2_1
 libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
 libr_cons.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From 9411e70fdb2cad12e13dbe9425fd864472c96116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 171/358] poco: rebuild against OpenSSL

---
 common/shlibs         | 26 +++++++++++++-------------
 srcpkgs/poco/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e215d8141d..610a1f621ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,19 +2957,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From b7416fafe720506ab07ec00e07626d082208e6c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 172/358] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From c670fd5aa280500fcba32d7d58fc907288d469e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 173/358] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 8eda04462995bf076bba08374cc100785fda5d2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 174/358] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From e6cbdc6ba69e7d666d264110d36d0550d2e5950f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 175/358] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
 checkdepends="python-cryptography_vectors python-hypothesis python-pretend
  python-pytest python-pytz python-iso8601 ${depends}"

From 6b4ccc1f07cfa19440d6c3ae1192002c557a2ebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 176/358] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From c8e7a6d2f3d7f9dfc42e3e9edec244a1f91154fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 177/358] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 732abaa856ff77fcdd9c9e47578a6991a1a91f03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 178/358] qca-qt5: rebuild against OpenSSL

---
 common/shlibs            | 10 ++++++++++
 srcpkgs/qca-qt5/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 610a1f621ae..0e2d3cec3f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2205,6 +2205,16 @@ libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From 0925c153095ec27f661ee70b15915f4daf6743aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 179/358] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From cc4eaccce89ee7dcbc2a6fa4d85db9e8e8a4478f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 180/358] rabbitmq-c: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/rabbitmq-c/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0e2d3cec3f9..4f6c3c47ad9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3666,7 +3666,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From 0bb1df4bb0c36e7643db7de219871b75940aec67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 181/358] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 6a5ff5e15a8ac24cc02c3fb1940440937efbe996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 182/358] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From e2fbc9255501f5d69b65ba21557363742ede41b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 183/358] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From b5127dfc7a2dab8489a6292f4b511ef188c45e8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 184/358] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From 42a9e339bf1076a5307799762e80b132128162f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 185/358] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 03dc48698703fed2059f39549123cbe4945d1bdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 186/358] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 07b97dab05553eec7725959474e504ee8a9dc29a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 187/358] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 5ce9135af8c426c92726df715aa0cf99e5e3de8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 188/358] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From 9e1c60a0cef510ca639fc1469560395ecd5f1186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 189/358] rtmpdump: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/rtmpdump/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4f6c3c47ad9..887fe21af8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1103,7 +1103,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From e53be91d399bf71fed481ffd34257178a6eefa56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 190/358] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 27882159238d4b674c90eb8a5f27521b488ea251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 191/358] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 2c49405354d168805ae856964c301cae5935dbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 192/358] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 9bea20d34c2798ee13b93999c23b768209c476a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 193/358] s-nail: rebuild against OpenSSL

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f59355ee510a42b7071d955883128f9664a23af4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 194/358] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From f38831392674d37bd6f8d621ca2ddd01132fe966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 195/358] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From ce780f0fce218214aaff11af81cd01fecfba1e64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 196/358] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 2acae323e449b7b67d98f97c129f51e25496018f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 197/358] seafile-libclient: rebuild against OpenSSL

---
 common/shlibs                      | 2 +-
 srcpkgs/seafile-libclient/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 887fe21af8f..7a0feed6d8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2555,7 +2555,7 @@ libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From 4efa4463269b787c42ae75002a5a52f8b33139ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 198/358] serf: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/serf/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7a0feed6d8f..87bc4497ad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1436,7 +1436,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 4bc6aea87f072097f89a05dbc210fc85e082d3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 199/358] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From 7791ae686b56453547f4f1ff2edca7249fdb9237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 200/358] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From 51ba274b54405fd00b58e769ed68d55cc7bb0418 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 201/358] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 67f6414ef2629733fbe57d82bb48b1ca36d408a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 202/358] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From d9858aab3926a1fc590d920d4aeda9daf06676a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 203/358] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 7bb1cf60b150135e8d3b11c5537d3ffb47d0e2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 204/358] spice: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/spice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 87bc4497ad1..d203a8a6c5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -805,7 +805,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 68e3d8d94edde10024bb9ef9033ac121cd7466b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 205/358] spice-gtk: rebuild against OpenSSL

---
 common/shlibs              | 6 +++---
 srcpkgs/spice-gtk/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d203a8a6c5b..024a5c1d704 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1189,9 +1189,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 7c5916103313afc61468ab09b153af7f4e9e513a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 206/358] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 744abdd17c35e286eb28986964eb19d6683596bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 207/358] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 20d38a9809dbb707501239e81daafd1b9ca2ac14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 208/358] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From f44a1fc1d90fffcd281bc291dd452d66a6f7b358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 209/358] sqlcipher: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/sqlcipher/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 024a5c1d704..03214aae585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2460,7 +2460,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From a16cc17c3f88716ef1916a13dab921c3ea8f5d48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 210/358] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From 4de63acb643cfa7a29a4f9ee019b6fa54b8c1308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 211/358] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From 3dcedeb937d474775143ade0a2e0be4cfb00bed1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 212/358] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From 5ede4fe5281d3cf56079888bf46fcd123bb13890 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 213/358] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 01f38986ee580b661a7ace29fca4227af80b5630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 214/358] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3a21634e52afa1ed30a176721b356af0de07db81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 215/358] swi-prolog: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/swi-prolog/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 03214aae585..9483655df5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2847,7 +2847,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9ac6d9aba243c89bb47d946536bb98b7209af82b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 216/358] swiften: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/swiften/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9483655df5e..587fa08583c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2573,7 +2573,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 166174c435f5d949065e72b35548e22f306d68fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 217/358] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From e65e030af20e2e244cecc662c08f2cd209cea0bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 218/358] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license=" GPL-2.0-or-later, LGPL-2.1-or-later"

From 2a43e96749288ff614d98c37a5103b24279b4de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 219/358] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 9ba2de6b7b60faf7b8a0992806acb2e3fdadc6d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 220/358] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
 make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 676cfde27f3960a9b51fd87e521bc40b1a305668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 221/358] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 24f3b3c17c495b72341513263d464821ea2695af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 222/358] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From e890e3abb2f2ff741eba89571353932f96ca24be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 223/358] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b88b8907427cf050b375a9f18d615cac46da37ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 224/358] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 2a1927460e6ceb55ff87542b65b205cd7a76b194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 225/358] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 745a7ce652c57d76396e776efe0e2e563ee1eaef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 226/358] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 44641597313244bff72904560825a988e3a8b6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 227/358] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From c300345a78e5f1e3492b7d1d690b6c71c60d1a0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 228/358] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 33a61625181608d80104ed67cfb7daab76464dff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 229/358] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 1d4ed73a75740479cece3b5e4c82c44d999a7e3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 230/358] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 02a645482c19f8be0b54b50abcc6136b4d15ef67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 231/358] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 36b87f10d029e41f54f229da7b744ab3ae1f054b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 232/358] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 58b4f896a6bf132741fd81707e958958390252f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 233/358] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From bd1a967186c75798b093c0f373ab8e13de15affc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 234/358] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 05e314974392c06ae3b8c26d1708f896aec8a5f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 235/358] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From 110d0a5cfd1844ffbbeed4850fe426809705d5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 236/358] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 619c07091535f5361a3202a53bd5218339e35ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 237/358] trousers: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/trousers/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 587fa08583c..8ddee828fe0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2528,7 +2528,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 75c47f92b11f8de55abebceb19f9667716ff04c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 238/358] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 768b20cb778b42515fb770d12d44cd3e0ec2cd5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 239/358] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 3ad73210c8402f550870013cc91e8548dfb91e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 240/358] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From eeb82f35aeb6caa37766255336596e2be96663c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 241/358] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 9c93c5d12e945a409ef4c57dbaa02033d70f3bab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 242/358] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From c4afdea73738fd889e181340f35d846d3b0ee744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 243/358] unbound: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/unbound/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ddee828fe0..10a944c2670 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3073,7 +3073,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
 libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 0c615f7e91fc1f39a9544e9f0842659f64a4b58d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 244/358] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 7b75626de98383e24684e577aa732a8541cd3773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 245/358] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 90e58f6c6ffddd48548d94a155433dd3f814bf0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 246/358] vde2: rebuild against OpenSSL

---
 common/shlibs         | 8 ++++----
 srcpkgs/vde2/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 10a944c2670..539f77e5ba5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1111,10 +1111,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
 libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 39c575345a24c3f2e1d6ad9e8d9d5484a57d8bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 247/358] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From e4b734ac45f4739e3bb513d9d4395ab62deaa3a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 248/358] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From be33d4d06fcb549fdcc6d715619020de2e808990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 249/358] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 93d00519eb7b56601dc40f612d74a877f4b8f83c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 250/358] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From a83ab28414e3c236025603a3fbebcdc5c7edfa90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 251/358] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 0c4707e9f1ef2497e3ddcd07c0a45ba967c13b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 252/358] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 0bcbb35bc4e12f88fff3f526eb57114f8da23932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 253/358] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From d316d5f4609ea1f17fae910c835ec20bfb0079ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 254/358] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 7574362a3c2eeb491660f84f224d0324e9cafa1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 255/358] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.9
-revision=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 801bd1d751a58a672bc81a31aec7e9c292a5afac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 256/358] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 59f1cd4c82c6840e8d5a9964006728a98bf8d6b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 257/358] wvstreams: rebuild against OpenSSL

---
 common/shlibs              | 8 ++++----
 srcpkgs/wvstreams/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 539f77e5ba5..258f0d8f87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2105,10 +2105,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
 libopencv_rapid.so.4.3 libopencv4-4.3.0_1
 libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
 libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From c01728ff0fd9f33069d0e81d6f6500e6e862680d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 258/358] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 08c50ce1fea46d8b5f218511b002f6b61a37575b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 259/358] xar: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/xar/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 258f0d8f87c..463ede7bb6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1118,7 +1118,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 05c6723a4f75c2468e4174e9c641f6680e2a6bfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 260/358] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 62c739eba88b1f371b0b46625ba23f42c5691c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 261/358] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 46b7d0e415517ec285348659a7db84f40778ddb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 262/358] xmlsec1: rebuild against OpenSSL

---
 common/shlibs            | 10 +++++-----
 srcpkgs/xmlsec1/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 463ede7bb6a..a2434b0ea26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1557,9 +1557,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1755,8 +1755,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From ad730c5833f955b819100d261704fff3e281211f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 263/358] yara: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a2434b0ea26..e82f49d9c10 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2999,7 +2999,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From 56f6683cd56516fe4540f7a7d6aaa55bf9a9d61f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 264/358] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From 6bbfdff85986875d22994f58eca53c2f50e3d31b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 265/358] yubico-piv-tool: rebuild against OpenSSL

---
 common/shlibs                    | 4 ++--
 srcpkgs/yubico-piv-tool/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e82f49d9c10..fe62aa41359 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3149,8 +3149,8 @@ libr_crypto.so.5.0.0 radare2-5.0.0_1
 libr_fs.so.5.0.0 radare2-5.0.0_1
 libr_magic.so.5.0.0 radare2-5.0.0_1
 libr_reg.so.5.0.0 radare2-5.0.0_1
-libykpiv.so.1 libykpiv-1.5.0_1
-libykcs11.so.1 libykcs11-1.5.0_1
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From 1afbdc5234d39fc35f73bb66d37837842dce3ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 266/358] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 14503aacf7fc417d3f742e00ecf7e16fff142c40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 267/358] zchunk: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/zchunk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe62aa41359..a32c9d1569f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3525,7 +3525,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 35497a2d8224b71e8b6a1a9e7fd8256edfa93de9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 268/358] zeek: rebuild against OpenSSL

---
 common/shlibs         | 10 +++++-----
 srcpkgs/zeek/template |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a32c9d1569f..2ba3301b12e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3533,11 +3533,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From bfedac574a8c3181ab57e87747de0143d6c64165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 269/358] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f8ec145b1d144d1fca4ed0bff2f5e011cc709c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 270/358] dovecot-plugin-pigeonhole: rebuild against OpenSSL

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From aea99f302687866f815377abebd6fb3aeba45759 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 271/358] easyrsa: rebuild against OpenSSL

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 6ea4009bbb55d7f2cc98bf3ea41dadd409e5be2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 272/358] fbpdf: rebuild against OpenSSL

---
 srcpkgs/fbpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ff77b4d96c19bf38a65d0504101355853230bfaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 273/358] godot: rebuild against OpenSSL

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"

From 8d1fbe8c538ef3284c650da4da5791d4044df8ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 274/358] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From b62873f47e51fe253e3140ff43b97be54c97d3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 275/358] hcxdumptool: rebuild against OpenSSL

---
 srcpkgs/hcxdumptool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From fa4d0c1e34301545f567103e0e971243b2ac9ac9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 276/358] hcxtools: rebuild against OpenSSL

---
 srcpkgs/hcxtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From e6f080faf20efbb114bd79b03a64ac3209fca461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 277/358] kodi-addon-inputstream-rtmp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 101784c5d7b655470d547427c04fd3264efb0aa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 278/358] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From dc9b3eb70080011bd1d9e930fe73728d042f360f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 279/358] kodi-rpi: rebuild against OpenSSL

---
 srcpkgs/kodi-rpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
  libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From d687b77d6d1e7bf6c2c8efd1743cf1b07c98764c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 280/358] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From ebd80d560de3f4e03fd98f726c88111de8fcd805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 281/358] libsignal-protocol-c: OpenSSL is only a checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From 85122f77ab0d4149a5bad7844a093f9aba1acc86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 282/358] libvncserver: rebuild against OpenSSL

---
 common/shlibs                 | 4 ++--
 srcpkgs/libvncserver/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2ba3301b12e..aed3202ad18 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1403,8 +1403,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 39bc674d775a20a7c9e114e80021f52ba885c640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 283/358] linux-tools: rebuild against OpenSSL

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From 2ca33827bd9a77802e091bf6e030842cf27023f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 284/358] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 0d1b0a155d65839e1fa0a30a8d7228b6b9c9efd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 285/358] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 93c98551ef8dab840e2060aec8ddfbc5904ab800 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 286/358] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index aed3202ad18..669b7e91b66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -593,7 +593,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From db8ce1d610677762c9dcfff178bde5305b02a3f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 287/358] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 6a768f4304b91ee017caf095c77c0465e75b9858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 288/358] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From c57185d63aec10abffbb051e9170827e14f1ad3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 289/358] nodejs-lts-10: change openssl buildoption to OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From a9c4b7c7ee1c814f8b49572d6c5fe2e95a97bb4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 290/358] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 66443b7f8702df9dbd407048db83ce34518c8628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 291/358] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From 2ebe88db5c84f60fe0e4c4f715f0efed61ba4581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 292/358] tree-wide: rebuild against OpenSSL

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 11d42b317e6a4d941a1100f36ea92d24ea4fb186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 293/358] open-vm-tools: rebuild against OpenSSL

---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From 37453a62d7e5f68186479b06814e7f9395da922a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 294/358] openjdk11: rebuild against OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 9a75612c32be36b262daa292355c2e5cc910d00e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 295/358] opensmtpd-extras: rebuild against OpenSSL

---
 srcpkgs/opensmtpd-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From a1bbf52998cf6c82a140897926d2b5ac82084915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 296/358] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From ffeb2ee060bc17c75039e267ca3a41a374596fd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 297/358] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From 1d816363a8356ed82bb9bdfba64c1858449d0797 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 298/358] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From b5a2375a8e176c1842d9dcb2c09848f5b32585ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 299/358] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2c0ceec362dd678866a172cdd1c9ddb8d52f69fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 300/358] python3-grpcio: rebuild against OpenSSL

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 9b2aec2f1562840c602d35f8068b346a369136a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 301/358] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From 511bdc37e54b5745cbc66c4581e252992974a433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 302/358] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From fe697484e99d67803b156af902e540e539c4b434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 303/358] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From fbb75a02df5353b3e333d63040abc656a80826e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 304/358] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From 0ae090448e3ae3b04c2cef989863704319e9503e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 305/358] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 1ff62d59f9b9a1bf7389f42fdb1a61bd92271bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 306/358] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 8a047d2d5434f218ebb2b9587cb29f38d83ecc98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 307/358] slurm-wlm: rebuild against OpenSSL

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="perl cgit python pkg-config"
 # XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From 999cdd6759eb26f3ff12bab9cc782ed4e8e2e563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 308/358] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 83e84c22530438eebcbdbefa9c7ecac90f36da9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 309/358] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From f6f7f3f708d63bfcb2ab41117a793de4e9f30745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 310/358] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 7174fcd2486395c42d301b4685870661e0e79aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 311/358] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 27a211f2382..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From 90cb551ad8f334de0a8d8e3e8c5ac48abbf7c03c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 312/358] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1cd4afdcb53af1e70b2149a8636e51a884134c50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 313/358] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 8a7c25d329c4c8c8d90570652c5286d02d9ae220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 314/358] xen: change to OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From ae26d5e0de60fe94aeb881f2caa05be4369f2098 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 315/358] srcpkgs: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 3b16cabecb77a671ccb08b4baf6269611ac9dc6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 316/358] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From a7d94fe746f8ab8c2e0df4b1fcc2a9252631c286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 317/358] gitui: rebuild against OpenSSL

---
 srcpkgs/gitui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From 703f36ec79fec61ede63b0fb3f8cf2e08951d14e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 318/358] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 610d0976f9d0d9c98e11c03ec583900da3ac3865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 319/358] libgdal: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgdal/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 669b7e91b66..5f898cc2f84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2462,7 +2462,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From d8f2c7781fd9d1536ce222d94b89a4a7bc720c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 320/358] lxc: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/lxc/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f898cc2f84..0c075fbd210 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1561,7 +1561,7 @@ libxmlsec1.so.1 xmlsec1-1.2.31_2
 libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
 libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From d3f5e5ff798c7f48280f68ad28eb1a3d78433f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 321/358] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 5afe8650bd5711b2f1e9d9a2b2aae04a554931ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 322/358] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From 8529375d7ff71a1f3814efa59151fc738b3c8410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 323/358] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From b08fdbc7485611baa0a54bc9e2697fcb1c62cdc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 324/358] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From b74779a5b64d4468e0aca840dae8ecfe5d1a4315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 325/358] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From 0d04ea1ca128c1bbcc5ac016a46aa525d2d8dbba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 326/358] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From c79b6bed2792f333d4a077fafe355744c52a61e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 327/358] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 4c476a1750fc042db43f6b49ae55e2b2cabd9ebc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 328/358] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 74e61a3f19404a3ef0168f05837e45f35c9eb25c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 329/358] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From 25be5d11307f56d7fe623a3af80a977f1ca7bc7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 330/358] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
 version=6.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 9676e96292524e488418e9adaa556a09e1cc368c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 331/358] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 610de769efc3b3a269499cf92838a4889cfe78f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 332/358] sssd: rebuild against OpenSSL

---
 common/shlibs         | 18 +++++++++---------
 srcpkgs/sssd/template |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0c075fbd210..e2678506a33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2713,15 +2713,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From b43bb274f40a2a1a72b23d40c93716248d185a97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 333/358] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 53001765e4f574ab5257425dc491ba2b32a389fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 334/358] xmlrpc-c: rebuild against OpenSSL

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/xmlrpc-c/template |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e2678506a33..814ca4c886c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1767,22 +1767,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From 7479968edbaec85855e5e7f80ae5f58b50e18ff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 335/358] zfs: rebuild against OpenSSL

---
 common/shlibs        | 12 ++++++------
 srcpkgs/zfs/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 814ca4c886c..6579ea69486 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3816,12 +3816,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From f703736603bb93fd0ee3878786373d033cd3b83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 336/358] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From dd6a7057cc96602f055165e98e220239e6378e5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 337/358] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From ac241fb813033d62446eced1f3335d02cc1bddff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 338/358] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
 checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"

From 6f7f9f72c1473d9c2541d806f836aaeb24444ef8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 339/358] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
 configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From d36b29253cfe6e41e196c527852ed7734b4f8eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 340/358] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 9d72f1bf9e7f894df059a4ef12b6e3d88b5ef451 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 341/358] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 27f5c4db8b697f2f702c2f35ef5feea914bbe5a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 342/358] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 313e38cff2896432706ce6fe273768b0c3cf4818 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 343/358] git-series: rebuild against OpenSSL

---
 srcpkgs/git-series/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From f3f4d69e727a9ef5d82240d8aee7bebaa6dae0b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 344/358] gip: rebuild against OpenSSL

---
 srcpkgs/gip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 14500819f4098e0e9709003c955656dfab1a2db3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 345/358] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=6.1.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c22ce3f6574feae229393e4b4e764b6ae21b78e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 346/358] beaglebone-kernel: rebuild against OpenSSL

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From d197cb165304357f0e4388c422c32989b2f68649 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 347/358] rpi-kernel: rebuild against OpenSSL

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 7015454de732d36344d4acc469dcb871dcf39f27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 348/358] sun7i-kernel: rebuild against OpenSSL

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From 6d6f7bae97dfc8d9fc39642101006c6b3bf4a2b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 349/358] ci20-kernel: rebuild against OpenSSL

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 128849dc61e969e86760992f5b1258105ad7838f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 350/358] pinebookpro-kernel: rebuild against OpenSSL

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 0d0c0e66604..dfdf391d0ae 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 76b220d07e2b27cbfbd4272b794ad4831670a7cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 351/358] pinephone-kernel: rebuild against OpenSSL

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index b201e6b993c..73631552a9b 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7e3dae5b3658884f8925b13d319dcf81c159cfb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 352/358] linux4.4: rebuild against OpenSSL

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 3bb2322e4d623d688f6b23703b3841eaf59cdca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 353/358] linux4.9: rebuild against OpenSSL

---
 srcpkgs/linux4.9/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From d01bd2715268e1805d77d7df7641dda85d5bd239 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 354/358] linux4.14: rebuild against OpenSSL

---
 srcpkgs/linux4.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From 3a227995f1988f61182e7098eed6acb2974571c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 355/358] linux4.19: rebuild against OpenSSL

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc..fbf723826ac 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.178
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 4a621ce8636966626b268e0f5ab758f82867417c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 356/358] linux5.10: rebuild against OpenSSL

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 45eecc75c3277ff14685ab1a865e4bfe97fce35a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 357/358] linux5.4: rebuild against OpenSSL

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d..8944092048b 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.102
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From f9b0c079dd78dd3801143712e2d6cbbdd115e83a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 358/358] linux5.11: rebuild against OpenSSL

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 0c01d11ba9e..1b513406214 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.3
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -25,7 +25,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

Re: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21056#issuecomment-791852198

Comment:
Has been mostly merged already, closing.

Thanks a lot!

Re: [PR PATCH] [Closed]: New package: openssl-1.1.1j

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

There's a closed pull request on the void-packages repository

New package: openssl-1.1.1j
https://github.com/void-linux/void-packages/pull/21056

Description:
[ci skip]

Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948

News post: https://github.com/void-linux/void-linux.github.io/pull/135/

TODO items: #29187